Merge pull request #66 from seddonym/python-38

Add compatibility for Python 3.8
seddonym · Oct 16, 2019 · 4e44c51 · 4e44c51
2 parents 6b8a050 + 5cf0b6b
commit 4e44c51
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,11 @@ matrix:
       sudo: required
       env:
         - TOXENV=py37,report
+    - python: '3.8-dev'
+      dist: xenial
+      sudo: required
+      env:
+        - TOXENV=py38,report
 before_install:
   - python --version
   - uname -a

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -50,4 +50,9 @@ Changelog
 -----------------
 
 * Allow multiple root packages.
-* Make containers optional in Layers contracts.
+* Make containers optional in Layers contracts.
+
+latest
+------
+
+* Officially support Python 3.8.
diff --git a/setup.py b/setup.py
@@ -43,6 +43,7 @@ def read(*names, **kwargs):
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Utilities",
     ],

diff --git a/tests/adapters/filesystem.py b/tests/adapters/filesystem.py
@@ -82,7 +82,7 @@ def _parse_contents(self, raw_contents: Optional[str]):
 
         yamlified_string = "\n".join(yamlified_lines)
 
-        return yaml.load(yamlified_string)
+        return yaml.safe_load(yamlified_string)
 
     def _dedent(self, lines: List[str]) -> List[str]:
         """

diff --git a/tox.ini b/tox.ini
@@ -3,13 +3,14 @@ envlist =
     clean,
     check,
     docs,
-    {py36,py37},
+    {py36,py37,py38},
     report
 
 [testenv]
 basepython =
     py36: {env:TOXPYTHON:python3.6}
     py37: {env:TOXPYTHON:python3.7}
+    py38: {env:TOXPYTHON:python3.8}
     {clean,check,docs,report}: {env:TOXPYTHON:python3}
 setenv =
     PYTHONPATH={toxinidir}/tests
@@ -21,7 +22,7 @@ deps =
     pytest==3.10.0
     pytest-travis-fold==1.3.0
     pytest-cov==2.6.0
-    PyYAML==3.13
+    PyYAML==5.1.2
 commands =
     {posargs:pytest --cov --cov-report=term-missing -vv tests}