diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml index b15ff11d2e..82bb478958 100644 --- a/.github/workflows/tox.yml +++ b/.github/workflows/tox.yml @@ -11,10 +11,10 @@ jobs: fail-fast: false matrix: python-version: - - '3.8' - '3.9' - '3.10' - '3.11' + - '3.12' runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -22,7 +22,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Install dependencies - run: python -mpip install --upgrade wheel pytest tox + run: python -mpip install --upgrade wheel pytest tox setuptools - name: Get tox target id: toxtarget run: | diff --git a/tox.ini b/tox.ini index 2f9303c63f..a7a22cb92b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] # Default tox environment when run without `-e` -envlist = py38, py39, py310, py311 +envlist = py39, py310, py311, py312 # https://tox.readthedocs.io/en/latest/config.html#conf-requires # Ensure pip is new so we can install manylinux wheel @@ -9,6 +9,7 @@ requires = pip >= 19.0.0 [testenv] deps = + setuptools pre-commit numpy>=1.9 pytest @@ -17,11 +18,10 @@ deps = # https://github.com/pytest-dev/pytest-xdist/issues/585 pytest-xdist < 2 restructuredtext-lint - https://github.com/ome/zeroc-ice-py-github-ci/releases/download/0.2.0/zeroc_ice-3.6.5-cp38-cp38-linux_x86_64.whl; platform_system=="Linux" and python_version=="3.8" https://github.com/ome/zeroc-ice-py-github-ci/releases/download/0.2.0/zeroc_ice-3.6.5-cp39-cp39-linux_x86_64.whl; platform_system=="Linux" and python_version=="3.9" https://github.com/ome/zeroc-ice-py-github-ci/releases/download/0.2.0/zeroc_ice-3.6.5-cp310-cp310-linux_x86_64.whl; platform_system=="Linux" and python_version=="3.10" - https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20231024/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl; platform_system=="Linux" and python_version=="3.11" - + https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl; platform_system=="Linux" and python_version=="3.11" + https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp312-cp312-manylinux_2_28_x86_64.whl; platform_system=="Linux" and python_version=="3.12" setenv = OMERODIR = {toxinidir} DJANGO_SETTINGS_MODULE = omeroweb.settings