From 1348d52db73d86fb74174c5f3de9c65ebe2d309e Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 13:20:34 +0000 Subject: [PATCH 1/3] remove distutils --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 77d4cad..940ccb3 100644 --- a/setup.py +++ b/setup.py @@ -13,9 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import distutils.dir_util from setuptools import setup import os +import shutil import sys @@ -27,9 +27,9 @@ 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, "SpiNNGym.egg-info") if os.path.isdir(egg_dir): - distutils.dir_util.remove_tree(egg_dir) + shutil.rmtree(egg_dir) setup() From 35d34e8314928f00eacb6eeca2cd62da1e91d8f6 Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 13:36:28 +0000 Subject: [PATCH 2/3] python 3.12 --- .github/workflows/c_actions.yml | 4 ++-- .github/workflows/python_actions.yml | 8 ++++---- setup.cfg | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/c_actions.yml b/.github/workflows/c_actions.yml index 631acdc..d2addac 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -22,11 +22,11 @@ jobs: steps: - name: Install Ubuntu packages run: sudo apt-get install doxygen gcc-arm-none-eabi --fix-missing - - name: Configure Python 3.8 + - name: Configure 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: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index baa9733..6b6dde6 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -21,7 +21,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: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -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: ${{ env.CODE_PATHS }} coveralls-token: ${{ secrets.COVERALLS_REPO_TOKEN }} @@ -83,10 +83,10 @@ jobs: # base-path: examples spinn_gym - name: Run rat copyright enforcement - if: matrix.python-version == 3.8 + if: matrix.python-version == 3.12 uses: ./support/actions/check-copyrights - name: Validate CITATION.cff - if: matrix.python-version == 3.8 + if: matrix.python-version == 3.12 uses: dieghernan/cff-validator@main diff --git a/setup.cfg b/setup.cfg index 68bec73..1469523 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,16 +31,16 @@ 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" [options] -python_requires = >=3.7, <4 +python_requires = >=3.8, <4 packages = find: zip_safe = True include_package_data = True From cbbce057c7119aedae7b2052b98bdf636f64379e Mon Sep 17 00:00:00 2001 From: "Christian Y. Brenninkmeijer" Date: Tue, 2 Jan 2024 15:38:22 +0000 Subject: [PATCH 3/3] # pylint: disable=abstract-method --- spinn_gym/games/spinn_gym_machine_vertex.py | 1 + 1 file changed, 1 insertion(+) diff --git a/spinn_gym/games/spinn_gym_machine_vertex.py b/spinn_gym/games/spinn_gym_machine_vertex.py index 5f6f001..855c2cd 100644 --- a/spinn_gym/games/spinn_gym_machine_vertex.py +++ b/spinn_gym/games/spinn_gym_machine_vertex.py @@ -33,6 +33,7 @@ import AbstractHasAssociatedBinary +# pylint: disable=abstract-method class SpinnGymMachineVertex(MachineVertex, AbstractGeneratesDataSpecification, AbstractReceiveBuffersToHost, AbstractHasAssociatedBinary):