Skip to content

Commit

Permalink
Merge branch 'master' into pylint_strict
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian-B authored Jan 5, 2024
2 parents 3670018 + 89ad562 commit 07bd1f7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}

Expand All @@ -75,7 +75,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
python-version: ["3.8"]
python-version: [3.12]

steps:
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ 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 =
spinnaker
machine interface

[options]
python_requires = >=3.7, <4
python_requires = >=3.8, <4
packages = find:
zip_safe = True
include_package_data = True
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()

0 comments on commit 07bd1f7

Please sign in to comment.