From 0044eb0c6b7a1ce2da425c34771f6d130f30da89 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 3c58b3cd..cc8a51ff 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, "SpiNNakerGraphFrontEnd.egg-info") if os.path.isdir(egg_dir): - distutils.dir_util.remove_tree(egg_dir) + shutil.rmtree(egg_dir) setup() From cf9794f87b4861963d3c9f31c60444360b7dbd15 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 e372fdbd..c59de60a 100644 --- a/.github/workflows/c_actions.yml +++ b/.github/workflows/c_actions.yml @@ -30,10 +30,10 @@ jobs: uses: ./support/actions/apt-get-install with: packages: doxygen gcc-arm-none-eabi - - name: Set up Python 3.8 + - name: Set up Python 3.12 uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.12 - name: Checkout SpiNNaker Dependencies uses: ./support/actions/install-spinn-deps with: diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 3e46f91d..cc519a03 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"] env: BASE_PKG: spinnaker_graph_front_end @@ -63,7 +63,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 }} @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8] + python-version: [3.12] steps: - name: Checkout diff --git a/setup.cfg b/setup.cfg index 8f05b06b..c98f0f36 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,16 +30,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