From 2386d01abeacefa05fa6777a2844af2ad381beb8 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 09:56:03 +0000 Subject: [PATCH 1/4] python 3.12 --- .github/workflows/python_actions.yml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 49fdef9ef..d413e5e5d 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -23,7 +23,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - python-version: [3.8, 3.9, "3.10", "3.11"] + python-version: [3.8, 3.9, "3.10", "3.11", "3.12"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/setup.cfg b/setup.cfg index d0da79cde..95e679366 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,11 +30,11 @@ classifiers= Operating System :: Microsoft :: Windows Operating System :: MacOS Programming Language :: Python :: 3 - Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 maintainer = SpiNNakerTeam maintainer_email = spinnakerusers@googlegroups.com keywords = From efc16c1615b7cdc92ebf88a6507ab2cb8b1b0537 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 10:12:26 +0000 Subject: [PATCH 2/4] single tests on 3.12 --- .github/workflows/python_actions.yml | 4 ++-- doc/source/conf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index d413e5e5d..35ede4583 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -55,7 +55,7 @@ jobs: uses: ./support/actions/pytest with: tests: unittests - coverage: ${{ matrix.python-version == 3.8 }} + coverage: ${{ matrix.python-version == 3.12 }} cover-packages: spinnman coveralls-token: ${{ secrets.GITHUB_TOKEN }} @@ -74,7 +74,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - python-version: ["3.8"] + python-version: [3.12] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/doc/source/conf.py b/doc/source/conf.py index 0da78ccf5..107cb8cb8 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -56,7 +56,7 @@ spinnaker_doc_version = "latest" intersphinx_mapping = { - 'python': ('https://docs.python.org/3.8', None), + 'python': ('https://docs.python.org/3.12', None), 'spinn_utilities': ( f'https://spinnutils.readthedocs.io/en/{spinnaker_doc_version}/', None), From 823e4810837ca84a649c53261cdab6f8b946118f Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 11:04:58 +0000 Subject: [PATCH 3/4] python 3.12 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 95e679366..47fdafb90 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,7 @@ keywords = machine interface [options] -python_requires = >=3.7, <4 +python_requires = >=3.8, <4 packages = find: zip_safe = True include_package_data = True From 4160079f7e0009b4174ba348a63b2c4f42070e44 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 13:13:23 +0000 Subject: [PATCH 4/4] remove distutils --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index e9de24390..3a744d15a 100644 --- a/setup.py +++ b/setup.py @@ -12,8 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import distutils.dir_util from setuptools import setup +import shutil import os import sys @@ -26,8 +26,8 @@ this_dir = os.path.dirname(os.path.abspath(__file__)) build_dir = os.path.join(this_dir, "build") if os.path.isdir(build_dir): - distutils.dir_util.remove_tree(build_dir) + shutil.rmtree(build_dir) egg_dir = os.path.join(this_dir, "SpiNNMan.egg-info") if os.path.isdir(egg_dir): - distutils.dir_util.remove_tree(egg_dir) + shutil.rmtree(egg_dir) setup()