diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index ed2bdcf..6ee7183 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -14,15 +14,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # Run all supported Python versions on linux - python-version: ["3.7", "3.8", "3.9"] - os: [ubuntu-latest] - # Include one windows and macos run + # Run across a mixture of Python versions and operating systems include: + - os: ubuntu-latest + python-version: "3.11" - os: macos-latest - python-version: "3.9" + python-version: "3.10" - os: windows-latest python-version: "3.9" + - os: ubuntu-latest + python-version: "3.8" steps: - uses: brainglobe/actions/test@v1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index eb90a1c..d3cc34c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,12 @@ repos: - repo: https://github.com/pycqa/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort types: [text] types_or: [python, cython] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.1.0 + rev: v4.4.0 hooks: - id: check-docstring-first - id: check-executables-have-shebangs @@ -20,16 +20,16 @@ repos: # bump2version produces whitespace in setup.cfg, so exclude to # not inferfere with versioning exclude: setup.cfg - - repo: https://gitlab.com/pycqa/flake8 - rev: 3.9.2 + - repo: https://github.com/pycqa/flake8 + rev: 6.0.0 hooks: - id: flake8 - repo: https://github.com/psf/black - rev: 22.3.0 + rev: 22.12.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.931 + rev: v0.991 hooks: - id: mypy additional_dependencies: diff --git a/setup.py b/setup.py index f78fa2a..aa8e5ba 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ "flake8", ] }, - python_requires=">=3.7", + python_requires=">=3.8", packages=find_packages(exclude=("tests", "tests.*")), include_package_data=True, url="https://github.com/brainglobe/imio", @@ -48,10 +48,10 @@ "Development Status :: 3 - Alpha", "Operating System :: OS Independent", "Programming Language :: Python", - "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", "Intended Audience :: Developers", "Intended Audience :: Science/Research", ], diff --git a/tests/tests/test_imio.py b/tests/tests/test_imio.py index dd60835..4609706 100644 --- a/tests/tests/test_imio.py +++ b/tests/tests/test_imio.py @@ -9,7 +9,7 @@ @pytest.fixture() def layer(): - return np.tile(np.array([1, 2, 3, 4]), (4, 1)) + return np.tile(np.array([1, 2, 3, 4], dtype=np.int32), (4, 1)) @pytest.fixture() diff --git a/tox.ini b/tox.ini index 464ae73..978bb51 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,12 @@ [tox] -envlist = py{37,38,39} +envlist = py{38,39,310,311} [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 + 3.10: py310 + 3.11: py311 [testenv] extras =