Merge pull request #45 from SpiNNakerManchester/py38

Add testing with Python 3.8
SpiNNakerManchester · Aug 14, 2020 · c364e10 · c364e10
2 parents fd99b5d + daa7953
commit c364e10
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,12 +14,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 language: python
-python:
-    - 2.7
-    - 3.5
-    - 3.6
-    - 3.7
-dist: focal
+os: linux
+jobs:
+  include:
+    - name: Py3.6
+      python: 3.6
+      dist: bionic
+    - name: Py3.7
+      python: 3.7
+      dist: focal
+    - name: Py3.8
+      python: 3.8
+      dist: focal
+    - name: Py2.7 (legacy)
+      python: 2.7
+      dist: xenial
+    - name: Py3.5 (legacy)
+      python: 3.5
+      dist: bionic
+  fast_finish: true
 addons:
     apt:
         packages:
@@ -46,6 +59,3 @@ after_success:
     - coveralls
 notifications:
     email: false
-
-matrix:
-    fast_finish: true
diff --git a/setup.py b/setup.py
@@ -31,12 +31,12 @@
                 "partitioning and allocation system.",
     license="GPLv2",
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 5 - Production/Stable",
 
         "Intended Audience :: Developers",
         "Intended Audience :: Science/Research",
 
-        "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 
         "Natural Language :: English",
 
@@ -48,6 +48,7 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
     ],
     keywords="spinnaker allocation packing management supercomputer",
 

diff --git a/spalloc/config.py b/spalloc/config.py
@@ -81,7 +81,7 @@
 """
 import os.path
 import appdirs
-from six import iteritems
+from six import iteritems, PY3
 from six.moves import configparser
 
 # The application name to use in config file names
@@ -166,8 +166,13 @@ def read_config(filenames=None):
     for filename in filenames:
         try:
             with open(filename, "r") as f:
-                # TODO: Switch to read_file once we stop supporting 2.7
-                parser.readfp(f, filename)  # pylint: disable=deprecated-method
+                # TODO: Remove use of readfp once we stop supporting 2.7
+                if PY3:
+                    parser.read_file(  # pylint: disable=no-member
+                        f, filename)
+                else:
+                    parser.readfp(  # pylint: disable=deprecated-method
+                        f, filename)
         except (IOError, OSError):
             # File did not exist, keep trying
             pass