From c5bda3d8ad0317d7d6500f37e28f1430bab2344b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 10:16:44 +0000 Subject: [PATCH 1/3] python 3.12 --- .github/workflows/python_actions.yml | 6 +++--- doc/source/conf.py | 2 +- setup.cfg | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 96d3a8dea..0a8a181c8 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -27,7 +27,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 }} @@ -61,7 +61,7 @@ jobs: uses: ./support/actions/pytest with: tests: unittests - coverage: ${{ matrix.python-version == 3.8 }} + coverage: ${{ matrix.python-version == 3.12 }} cover-packages: ${{ env.BASE_PKG }} coveralls-token: ${{ secrets.GITHUB_TOKEN }} @@ -82,7 +82,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 268db6404..9031eccf0 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -55,7 +55,7 @@ spinnaker_doc_version = "latest" intersphinx_mapping = { - 'python': ('https://docs.python.org/3.8', None), + 'python': ('https://docs.python.org/3.12', None), 'numpy': ("https://numpy.org/doc/1.20/", None), 'jsonschema': ( 'https://python-jsonschema.readthedocs.io/en/stable/', None), diff --git a/setup.cfg b/setup.cfg index e51c175cd..1dbf8ef53 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,11 +29,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 00d5618c006871885c2f0262c00bbbc70593fa8a Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 11:05:43 +0000 Subject: [PATCH 2/3] python 3.12 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 1dbf8ef53..b5b085ff1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,7 +43,7 @@ keywords = placement [options] -python_requires = >=3.7, <4 +python_requires = >=3.8, <4 packages = find: zip_safe = True include_package_data = True From aa74eee0c99d26114303c4dc040a5d197f720a00 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 13:13:23 +0000 Subject: [PATCH 3/3] remove distutils --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 253162f86..6be581975 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, "SpiNNaker_PACMAN.egg-info") if os.path.isdir(egg_dir): - distutils.dir_util.remove_tree(egg_dir) + shutil.rmtree(egg_dir) setup()