From 3dbfe320398196e4767efba964bb2d120bd92f1b Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 13:20:34 +0000 Subject: [PATCH 1/2] remove distutils --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index a8e2122..1ff5756 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,9 @@ # along with this program. If not, see . -import distutils.dir_util from setuptools import setup import os +import shutil import sys @@ -28,8 +28,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_PDP2.egg-info") if os.path.isdir(egg_dir): - distutils.dir_util.remove_tree(egg_dir) + shutil.rmtree(egg_dir) setup() From 3cee05a642595f483d0220ec5579733effa6ac23 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 13:36:28 +0000 Subject: [PATCH 2/2] python 3.12 --- .github/workflows/c_actions.yml | 4 ++-- .github/workflows/python_actions.yml | 6 +++--- setup.cfg | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 25e6645..27dc62b 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -29,11 +29,11 @@ jobs: with: repository: SpiNNakerManchester/SupportScripts path: support - - name: Set up Python 3.8 + - name: Set up Python 3.12 # Note: Python is needed for spinn_utilities.make_tools when building uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.12 - name: Install Ubuntu dependencies uses: ./support/actions/apt-get-install with: diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 23f5af5..883873b 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest 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: Checkout @@ -64,7 +64,7 @@ jobs: uses: ./support/actions/pytest with: tests: unittests - coverage: ${{ matrix.python-version == 3.8 }} + coverage: ${{ matrix.python-version == 3.12 }} cover-packages: spinn_pdp2 coveralls-token: ${{ secrets.GITHUB_TOKEN }} @@ -77,7 +77,7 @@ jobs: # package: spinn_pdp2 - name: Run rat copyright enforcement - if: matrix.python-version == 3.8 + if: matrix.python-version == 3.12 uses: ./support/actions/check-copyrights # Currently no xml files so no need to validate diff --git a/setup.cfg b/setup.cfg index a45f9fd..9e49bb1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,11 +31,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 = @@ -43,7 +43,7 @@ keywords = LENS style MLPs [options] -python_requires = >=3.7, <4 +python_requires = >=3.8, <4 packages = find: zip_safe = True include_package_data = True