diff --git a/.github/workflows/deploy_branch.yml b/.github/workflows/deploy_branch.yml index ff1be3145d..24d77d8118 100644 --- a/.github/workflows/deploy_branch.yml +++ b/.github/workflows/deploy_branch.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/deploy_protected.yml b/.github/workflows/deploy_protected.yml index 881a4eb77a..7f787e56c3 100644 --- a/.github/workflows/deploy_protected.yml +++ b/.github/workflows/deploy_protected.yml @@ -36,7 +36,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/deploy_release.yml b/.github/workflows/deploy_release.yml index de7a073cc2..ab7b68645b 100644 --- a/.github/workflows/deploy_release.yml +++ b/.github/workflows/deploy_release.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] environment: name: pypi diff --git a/.github/workflows/test_benchmark_collection_models.yml b/.github/workflows/test_benchmark_collection_models.yml index ab29938a12..023fe077e6 100644 --- a/.github/workflows/test_benchmark_collection_models.yml +++ b/.github/workflows/test_benchmark_collection_models.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.9" ] + python-version: [ "3.11" ] extract_subexpressions: ["true", "false"] env: AMICI_EXTRACT_CSE: ${{ matrix.extract_subexpressions }} diff --git a/.github/workflows/test_doc.yml b/.github/workflows/test_doc.yml index a4fe10de22..5fcf490eb7 100644 --- a/.github/workflows/test_doc.yml +++ b/.github/workflows/test_doc.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml index 0c624a33e5..9e1717d962 100644 --- a/.github/workflows/test_install.yml +++ b/.github/workflows/test_install.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -50,7 +50,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} @@ -83,7 +83,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test_performance.yml b/.github/workflows/test_performance.yml index c02245224c..6b66698d10 100644 --- a/.github/workflows/test_performance.yml +++ b/.github/workflows/test_performance.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test_petab_test_suite.yml b/.github/workflows/test_petab_test_suite.yml index b6465d554b..7e9a93c494 100644 --- a/.github/workflows/test_petab_test_suite.yml +++ b/.github/workflows/test_petab_test_suite.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: - python-version: [3.9] + python-version: ["3.11"] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test_pypi.yml b/.github/workflows/test_pypi.yml index fecda3edb0..1e91019c6f 100644 --- a/.github/workflows/test_pypi.yml +++ b/.github/workflows/test_pypi.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12"] os: [ubuntu-22.04, macos-latest] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/test_python_cplusplus.yml b/.github/workflows/test_python_cplusplus.yml index f729d47867..5714a37b21 100644 --- a/.github/workflows/test_python_cplusplus.yml +++ b/.github/workflows/test_python_cplusplus.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - python-version: [ "3.9" ] + python-version: [ "3.11" ] steps: - name: Cache @@ -117,7 +117,7 @@ jobs: strategy: matrix: - python-version: [ "3.9" ] + python-version: [ "3.10" ] steps: - name: Set up Python ${{ matrix.python-version }} @@ -193,7 +193,7 @@ jobs: strategy: matrix: - python-version: [ "3.9" ] + python-version: [ "3.11" ] steps: - name: Set up Python ${{ matrix.python-version }} @@ -233,7 +233,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.11" - uses: actions/checkout@v4 - run: git fetch --prune --unshallow @@ -282,7 +282,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: "3.11" - uses: actions/checkout@v4 - run: git fetch --prune --unshallow diff --git a/.github/workflows/test_python_ver_matrix.yml b/.github/workflows/test_python_ver_matrix.yml index 414daadccc..01d455b18a 100644 --- a/.github/workflows/test_python_ver_matrix.yml +++ b/.github/workflows/test_python_ver_matrix.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] experimental: [false] steps: diff --git a/.github/workflows/test_sbml_semantic_test_suite.yml b/.github/workflows/test_sbml_semantic_test_suite.yml index 3c0b3bd149..69c78d44b4 100644 --- a/.github/workflows/test_sbml_semantic_test_suite.yml +++ b/.github/workflows/test_sbml_semantic_test_suite.yml @@ -29,7 +29,7 @@ jobs: matrix: cases: ["1-250", "251-500", "501-750", "751-1000", "1000-1250", "1251-"] - python-version: [ "3.9" ] + python-version: [ "3.11" ] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/test_valgrind.yml b/.github/workflows/test_valgrind.yml index 034945d461..b3f893647f 100644 --- a/.github/workflows/test_valgrind.yml +++ b/.github/workflows/test_valgrind.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: - python-version: [ "3.9" ] + python-version: [ "3.11" ] env: ENABLE_AMICI_DEBUGGING: "TRUE" @@ -57,7 +57,7 @@ jobs: strategy: matrix: - python-version: [ "3.9" ] + python-version: [ "3.11" ] env: ENABLE_AMICI_DEBUGGING: "TRUE" diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index fbd91ce73a..8b5b3b89f7 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -27,7 +27,7 @@ jobs: strategy: matrix: - python-version: [ "3.9" ] + python-version: [ "3.11" ] steps: - name: Set up Python ${{ matrix.python-version }} diff --git a/documentation/gfx/amici_workflow.png b/documentation/gfx/amici_workflow.png index 75f904ff7d..9eab380580 100644 Binary files a/documentation/gfx/amici_workflow.png and b/documentation/gfx/amici_workflow.png differ diff --git a/documentation/gfx/amici_workflow.svg b/documentation/gfx/amici_workflow.svg index ee1a86fccc..0d6ea41c64 100644 --- a/documentation/gfx/amici_workflow.svg +++ b/documentation/gfx/amici_workflow.svg @@ -7,9 +7,9 @@ viewBox="0 0 294.54358 107.54766" version="1.1" id="svg11110" - inkscape:version="1.1.1 (1:1.1+202109281946+c3084ef5ed)" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" sodipodi:docname="amici_workflow.svg" - inkscape:export-filename="/home/dweindl/src/AMICI-devel/documentation/gfx/amici_workflow.png" + inkscape:export-filename="amici_workflow.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -570,13 +570,13 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="3.959798" - inkscape:cx="83.085046" - inkscape:cy="80.180858" + inkscape:cx="76.771593" + inkscape:cy="80.433396" inkscape:document-units="mm" inkscape:current-layer="g22231" showgrid="false" inkscape:window-width="1920" - inkscape:window-height="974" + inkscape:window-height="1110" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -584,7 +584,9 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:pagecheckerboard="0" /> + inkscape:pagecheckerboard="0" + inkscape:showpageshadow="2" + inkscape:deskcolor="#d1d1d1" /> @@ -1498,7 +1500,7 @@ id="tspan20651" x="-16.819941" y="40.732136" - style="stroke-width:0.264583px">>= 3.9 + style="stroke-width:0.264583px">>= 3.10 =3.9 +* Python>=3.10 * :term:`SWIG`>=3.0 * CBLAS compatible BLAS library (e.g., OpenBLAS, CBLAS, Atlas, Accelerate, Intel MKL) diff --git a/python/sdist/amici/setup.template.py b/python/sdist/amici/setup.template.py index 599c4df49b..11589564e0 100644 --- a/python/sdist/amici/setup.template.py +++ b/python/sdist/amici/setup.template.py @@ -72,7 +72,7 @@ def get_extension() -> CMakeExtension: packages=find_namespace_packages(), install_requires=["amici==TPL_AMICI_VERSION"], extras_require={"wurlitzer": ["wurlitzer"]}, - python_requires=">=3.9", + python_requires=">=3.10", package_data={}, zip_safe=False, classifiers=CLASSIFIERS, diff --git a/python/sdist/setup.cfg b/python/sdist/setup.cfg index d34d42f98f..7b8f7b32e7 100644 --- a/python/sdist/setup.cfg +++ b/python/sdist/setup.cfg @@ -25,14 +25,14 @@ classifiers = packages = find_namespace: package_dir = amici = amici -python_requires = >=3.9 +python_requires = >=3.10 install_requires = cmake-build-extension==0.5.1 sympy>=1.9 - numpy>=1.19.3; python_version=='3.9' numpy>=1.21.4; python_version>='3.10' numpy>=1.23.2; python_version=='3.11' - numpy; python_version>='3.12' + numpy>=1.26.2; python_version=='3.12' + numpy; python_version>='3.13' python-libsbml pandas>=2.0.2 pyarrow