launchpad-reviewers team mailing list archive

["Thiago F. Pappacena" <pappacena@xxxxxxxxx>]

Thiago F. Pappacena has proposed merging ~pappacena/turnip:python3-simple-deps-upgrade into turnip:master.

Commit message:
Upgrading support dependencies for better compatibility with Python 3.

These dependencies are small and support libs that we will need to upgrade for Python 3, but in this MP I'm not touching the most important libs yep (like pygit2, pyramid, twisted, etc). There is also a MP with the deps upgrades on turnip-dependencies repo.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/turnip/+git/turnip/+merge/380116
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/turnip:python3-simple-deps-upgrade into turnip:master.

diff --git a/.gitignore b/.gitignore
index fb9d39c..d35921f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ parts
 tags
 TAGS
 turnip/version_info.py
+.idea
diff --git a/Makefile b/Makefile
index c43f2ee..fd37a2f 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ endif
 	 echo "allow_hosts = ''"; \
 	 echo 'find_links = file://$(realpath $(PIP_SOURCE_DIR))/') \
 		>$(ENV)/.pydistutils.cfg
-	$(VIRTUALENV) --never-download $(ENV)
+	$(VIRTUALENV) $(VENV_ARGS) --never-download $(ENV)
 	$(PIP) install $(PIP_ARGS) -r bootstrap-requirements.txt
 	$(PIP) install $(PIP_ARGS) -c requirements.txt \
 		-e '.[test,deploy]'
diff --git a/requirements.txt b/requirements.txt
index b706f3c..3f4ba76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,9 +1,9 @@
 appdirs==1.4.3
 asn1crypto==0.24.0
-attrs==17.4.0
-Automat==0.6.0
+attrs==19.3.0
+Automat==20.2.0
 beautifulsoup4==4.3.2
-cffi==1.11.4
+cffi==1.14.0
 constantly==15.1.0
 contextlib2==0.4.0
 cornice==0.19.0
@@ -11,13 +11,13 @@ cryptography==2.1.4
 docutils==0.14
 enum34==1.1.6
 envdir==0.7
-extras==0.0.3
-fixtures==1.0.0
+extras==1.0.0
+fixtures==3.0.0
 flake8==2.4.0
 gmpy==1.17
 gunicorn==19.3.0
-hyperlink==18.0.0
-idna==2.6
+hyperlink==19.0.0
+idna==2.9
 incremental==17.5.0
 ipaddress==1.0.19
 lazr.sshserver==0.1.8
@@ -26,31 +26,31 @@ m2r==0.1.14
 mccabe==0.3
 mistune==0.8.3
 Paste==2.0.2
-PasteDeploy==1.5.2
-pbr==1.8.1
+PasteDeploy==2.1.0
+pbr==5.4.4
 pep8==1.5.7
-pyasn1==0.1.7
-pycparser==2.10
+pyasn1==0.4.8
+pycparser==2.19
 pycrypto==2.6.1
 pyflakes==0.8.1
 pygit2==0.27.4
 pyramid==1.5.4
-python-mimeparse==0.1.4
+python-mimeparse==1.6.0
 # XXX: deryck 2012-08-10
 # See lp:~deryck/python-openid/python-openid-fix1034376 which
 # reapplied a patch from wgrant to get codehosting going again.
 python-openid==2.2.5-fix1034376
-PyYAML==3.11
+PyYAML==5.3
 repoze.lru==0.6
 setuptools-scm==1.17.0
 simplejson==3.6.5
-six==1.9.0
-testtools==1.8.1
+six==1.14.0
+testtools==2.3.0
 traceback2==1.4.0
 translationstring==1.3
 Twisted[conch]==18.4.0
-unittest2==1.0.1
-venusian==1.0
+unittest2==1.1.0
+venusian==2.1.0
 waitress==0.8.9
 WebOb==1.4
 WebTest==2.0.18
diff --git a/turnip/api/tests/test_store.py b/turnip/api/tests/test_store.py
index f035eca..9276303 100644
--- a/turnip/api/tests/test_store.py
+++ b/turnip/api/tests/test_store.py
@@ -118,7 +118,7 @@ class InitTestCase(TestCase):
         store.init_repo(repo_path)
         repo_config = pygit2.Repository(repo_path).config
         with open('git.config.yaml') as f:
-            yaml_config = yaml.load(f)
+            yaml_config = yaml.safe_load(f)
 
         self.assertEqual(bool(yaml_config['core.logallrefupdates']),
                          bool(repo_config['core.logallrefupdates']))
diff --git a/turnip/pack/helpers.py b/turnip/pack/helpers.py
index 43faa6e..8364464 100644
--- a/turnip/pack/helpers.py
+++ b/turnip/pack/helpers.py
@@ -111,7 +111,7 @@ def ensure_config(repo_root):
     about concurrency.
     """
     with open('git.config.yaml') as config_file:
-        git_config_defaults = yaml.load(config_file)
+        git_config_defaults = yaml.safe_load(config_file)
     config = Repository(repo_root).config
     for key, val in git_config_defaults.items():
         config[key] = val