Skip to content

Commit

Permalink
Merge pull request #260 from SpiNNakerManchester/python3.12
Browse files Browse the repository at this point in the history
Python3.12
  • Loading branch information
Christian-B committed Jan 5, 2024
2 parents eefe91d + 895ea97 commit 1003c12
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/python_actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
timeout-minutes: 5
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 All @@ -51,7 +51,7 @@ jobs:
uses: ./support/actions/pytest
with:
tests: unittests
coverage: ${{ matrix.python-version == 3.8 }}
coverage: ${{ matrix.python-version == 3.12 }}
cover-packages: ${{ env.ROOT_PKG }}
coveralls-token: ${{ secrets.GITHUB_TOKEN }}
env:
Expand All @@ -73,7 +73,7 @@ jobs:
timeout-minutes: 5
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 @@ -51,7 +51,7 @@
]

intersphinx_mapping = {
'python': ('https://docs.python.org/3.8', None),
'python': ('https://docs.python.org/3.12', None),
'numpy': ("https://numpy.org/doc/stable/", 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
utilities

[options]
python_requires = >=3.7, <4
python_requires = >=3.8, <4
packages = find_namespace:
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, "SpiNNUtilities.egg-info")
if os.path.isdir(egg_dir):
distutils.dir_util.remove_tree(egg_dir)
shutil.rmtree(egg_dir)
setup()
3 changes: 2 additions & 1 deletion spinn_utilities/ranged/abstract_sized.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from collections.abc import Sized
import itertools
import logging
import sys
from typing import Any, Optional, Sequence, Sized, SupportsInt, Tuple, Union
from typing import Any, Optional, Sequence, SupportsInt, Tuple, Union
from typing_extensions import TypeAlias, TypeGuard
import numpy

Expand Down
3 changes: 2 additions & 1 deletion spinn_utilities/ranged/ranged_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from __future__ import annotations
from collections.abc import Sized
from typing import (
Any, Callable, Generic, List, Iterable, Iterator, Optional, Sequence,
Sized, Tuple, Union, cast, final)
Tuple, Union, cast, final)
from typing_extensions import TypeAlias, TypeGuard
from spinn_utilities.overrides import overrides
from spinn_utilities.helpful_functions import is_singleton
Expand Down

0 comments on commit 1003c12

Please sign in to comment.