Merge pull request #416 from SpiNNakerManchester/3.10

test and support python 3.10 instead of 3.6
SpiNNakerManchester · Jan 12, 2022 · 070e3f7 · 070e3f7
2 parents a015273 + fa0e40c
commit 070e3f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10"]
     env:
       BASE_PKG: pacman
 

diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,8 @@ numpy > 1.13, < 1.21; python_version == '3.7'
 numpy; python_version >= '3.8'
 future
 lxml
-jsonschema
+jsonschema < 4.4; python_version == '3.6'
+jsonschema; python_version >= '3.7'
 sortedcollections
 SpiNNUtilities == 1!6.0.1
 SpiNNMachine == 1!6.0.1
diff --git a/setup.py b/setup.py
@@ -65,10 +65,10 @@
         "Operating System :: MacOS",
 
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
     ],
     packages=packages,
     package_data=package_data,
@@ -79,7 +79,8 @@
         "numpy > 1.13, < 1.21; python_version == '3.7'",
         "numpy; python_version >= '3.8'",
         'lxml',
-        'jsonschema',
+        "jsonschema < 4.4; python_version == '3.6'",
+        "jsonschema; python_version >= '3.7'",
         "sortedcollections"],
     maintainer="SpiNNakerTeam",
     maintainer_email="spinnakerusers@googlegroups.com"