diff --git a/.github/workflows/ci_python_compatibility.yaml b/.github/workflows/ci_python_compatibility.yaml index d21765ae..c0c8dc40 100644 --- a/.github/workflows/ci_python_compatibility.yaml +++ b/.github/workflows/ci_python_compatibility.yaml @@ -7,7 +7,7 @@ jobs: timeout-minutes: 5 strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Check out the source code diff --git a/.github/workflows/ci_python_macos.yaml b/.github/workflows/ci_python_macos.yaml index 9107472c..9045e767 100644 --- a/.github/workflows/ci_python_macos.yaml +++ b/.github/workflows/ci_python_macos.yaml @@ -7,7 +7,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - name: Check out the source code diff --git a/docs/source/installing.rst.in b/docs/source/installing.rst.in index 4ffd07b3..f81b0615 100644 --- a/docs/source/installing.rst.in +++ b/docs/source/installing.rst.in @@ -12,7 +12,7 @@ Python Installing MUSCLE3 on Python will install all the Python-based components of the system, i.e. the Python version of libmuscle, the YMMSL Python library, and -the MUSCLE Manager. This requires at least Python 3.7. +the MUSCLE Manager. This requires at least Python 3.8. MUSCLE3 is on PyPI as an ordinary Python package, so it can be installed via Pip in the usual way. It's normally a good idea to make a virtual environment diff --git a/setup.py b/setup.py index 58f23402..3d1a88c8 100644 --- a/setup.py +++ b/setup.py @@ -33,11 +33,12 @@ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: Apache Software License', 'Operating System :: POSIX :: Linux', - '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.11', + 'Programming Language :: Python :: 3.12', + ], packages=_muscle3_packages, package_dir={ @@ -50,14 +51,13 @@ 'muscle_manager=muscle3.muscle_manager:manage_simulation', 'muscle3=muscle3.muscle3:muscle3'] }, - python_requires='>=3.7, <4', + python_requires='>=3.8, <4', install_requires=[ 'click>=7.1,<9', 'matplotlib>=3,<4', 'msgpack>=1,<2', 'psutil>=5.0.0', - "numpy<1.22; python_version=='3.7'", - "numpy>=1.22; python_version>='3.8'", + "numpy>=1.22", 'qcg-pilotjob==0.13.1', 'typing_extensions>=4.4.0,<5', 'ymmsl>=0.13.0,<0.14' # Also in CI, update there as well diff --git a/tox.ini b/tox.ini index e9d89a3e..3f627cf5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37, py38, py39, py310, py311 +envlist = py38, py39, py310, py311, py312 skip_missing_interpreters = true [testenv] @@ -24,11 +24,11 @@ commands = [gh-actions] python = - 3.7: py37 3.8: py38 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [pycodestyle] max-doc-length = 88