Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Python3.7 support #1635

Merged
merged 64 commits into from
Jan 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
48c91d2
GHA: Use Python3.8 as default
dweindl Jan 11, 2022
d294ec0
Doc: Update Python requirement
dweindl Jan 11, 2022
c56321c
Update Python requirement
dweindl Jan 11, 2022
9a86757
Allow numpy >=1.22.0
dweindl Jan 11, 2022
b6f14b6
Fixup sdist
dweindl Jan 11, 2022
180293d
Update valgrind suppressions
dweindl Jan 11, 2022
ea5283f
fixup workflows
dweindl Jan 11, 2022
c54ad77
Update valgrind suppressions
dweindl Jan 11, 2022
2a18bd0
CMake: require py>=3.8
dweindl Jan 11, 2022
49acad3
Performance test: More time for sdist after change to 'build'
dweindl Jan 11, 2022
7d23311
add_dll_directory
dweindl Jan 11, 2022
8929c7e
Update valgrind suppressions
dweindl Jan 11, 2022
e36ac74
Performance test: More time for sdist after change to 'build'
dweindl Jan 11, 2022
61c311d
Add environment variable AMICI_DLL_DIRS to control DLL directories on…
dweindl Jan 11, 2022
f70a7b1
Update valgrind suppressions
dweindl Jan 11, 2022
676bf15
fixup dll dir?
dweindl Jan 11, 2022
bd8b100
Update valgrind suppressions
dweindl Jan 11, 2022
c74434d
fixup dll dir?
dweindl Jan 11, 2022
406f98b
Update valgrind suppressions
dweindl Jan 11, 2022
a9da2e9
fixup dll dir?
dweindl Jan 11, 2022
b90ef04
dumpbin
dweindl Jan 12, 2022
41d26d3
valgrind with py39
dweindl Jan 12, 2022
71cd08e
OpenBLAS 0.3.19
dweindl Jan 12, 2022
c296693
OpenBLAS 0.3.19
dweindl Jan 12, 2022
57f020d
vcvars64
dweindl Jan 12, 2022
c40f9f3
..
dweindl Jan 12, 2022
1d22361
static openblas?
dweindl Jan 12, 2022
0d502c8
Revert "static openblas?"
dweindl Jan 12, 2022
1069b8a
..
dweindl Jan 12, 2022
ab47e53
ucrt
dweindl Jan 12, 2022
2ac6795
..
dweindl Jan 12, 2022
7dc7409
..
dweindl Jan 12, 2022
364d811
..
dweindl Jan 12, 2022
8f69138
..
dweindl Jan 12, 2022
d798615
all path
dweindl Jan 12, 2022
0b79f0a
lib
dweindl Jan 12, 2022
b4b76fd
DMSVC_STATIC_CRT=ON
dweindl Jan 12, 2022
17915d6
py39?
dweindl Jan 12, 2022
595dc79
39
dweindl Jan 12, 2022
f831391
prnt
dweindl Jan 12, 2022
71a6eb5
prnt
dweindl Jan 12, 2022
e106b8c
..
dweindl Jan 12, 2022
e169948
dt
dweindl Jan 12, 2022
ce10cc6
-dt
dweindl Jan 12, 2022
9d7687a
py310
dweindl Jan 12, 2022
20dae97
dbg
dweindl Jan 12, 2022
0ec3423
doh
dweindl Jan 12, 2022
72418d6
..
dweindl Jan 12, 2022
b2b8f02
..
dweindl Jan 12, 2022
efa86ec
-path
dweindl Jan 12, 2022
294dead
temp
dweindl Jan 12, 2022
cf4745d
38
dweindl Jan 12, 2022
71661a0
-ucrt
dweindl Jan 12, 2022
3290ad1
-lib
dweindl Jan 12, 2022
3017930
-MSVC_STATIC_CRT
dweindl Jan 12, 2022
295d48c
vg-np
dweindl Jan 12, 2022
c32e71d
-extdir
dweindl Jan 12, 2022
bdcc737
vg 38
dweindl Jan 12, 2022
9642492
macos
dweindl Jan 12, 2022
e7d905b
vg-np
dweindl Jan 12, 2022
a5aaf20
Revert "macos"
dweindl Jan 12, 2022
1b0e938
stay with default python on macos
dweindl Jan 12, 2022
ace85a6
Merge branch 'develop' into drop_py37
dweindl Jan 12, 2022
93aa5f6
Merge branch 'develop' into drop_py37
dweindl Jan 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/deploy_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
with:
fetch-depth: 20
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/deploy_protected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- uses: actions/checkout@master
- run: git archive -o docker/amici.tar.gz --format=tar.gz HEAD
- name: Publish to Registry
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/deploy_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
with:
fetch-depth: 20
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/test_benchmark_collection_models.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [ 3.8 ]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
with:
fetch-depth: 20
Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/test_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
- run: git fetch --prune --unshallow

Expand All @@ -44,7 +53,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [ 3.8 ]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
- run: git fetch --prune --unshallow

Expand All @@ -55,12 +73,6 @@ jobs:
run: |
sudo scripts/downloadAndBuildDoxygen.sh

- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
# Semantic version range syntax or exact version of a Python version
python-version: '3.8'

# install amici dependencies
- name: apt
run: |
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/test_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
- run: git fetch --prune --unshallow

Expand Down Expand Up @@ -46,7 +55,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
- run: git fetch --prune --unshallow

Expand Down
14 changes: 12 additions & 2 deletions .github/workflows/test_performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ jobs:

runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
with:
fetch-depth: 20
Expand All @@ -31,7 +40,7 @@ jobs:
run: |
sudo apt-get update \
&& sudo apt-get install -y swig libatlas-base-dev
- run: pip3 install petab shyaml
- run: pip3 install petab shyaml build

- run: echo "${HOME}/.local/bin/" >> $GITHUB_PATH
- run: echo "${GITHUB_WORKSPACE}/tests/performance/" >> $GITHUB_PATH
Expand All @@ -40,7 +49,8 @@ jobs:
- name: Create AMICI sdist
run: |
cd python/sdist \
&& check_time.sh create_sdist /usr/bin/python3 setup.py sdist
&& check_time.sh create_sdist python3 -m build --sdist

- name: Install AMICI sdist
run: |
AMICI_PARALLEL_COMPILE=2 check_time.sh \
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/test_petab_test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ jobs:
env:
ENABLE_GCOV_COVERAGE: TRUE

strategy:
matrix:
python-version: [3.8]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
with:
fetch-depth: 20
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9, '3.10']
os: [ubuntu-20.04, macos-latest]

runs-on: ${{ matrix.os }}
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/test_python_cplusplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ jobs:
ENABLE_GCOV_COVERAGE: "TRUE"
CI_SONARCLOUD: "TRUE"

strategy:
matrix:
python-version: [ 3.8 ]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
- run: git fetch --prune --unshallow

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test_python_ver_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9, '3.10']
python-version: [3.8, 3.9, '3.10']
experimental: [false]
# Temporarily disabled because the respective jobs somehow runs infinitely
# include:
# - python-version: 3.10.0-alpha.5
# experimental: true

steps:
- run: echo "AMICI_DIR=$(pwd)" >> $GITHUB_ENV
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/test_sbml_semantic_test_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,14 @@ jobs:
matrix:
cases: ["1 - 250", "251 - 500", "501 - 750", "751 - 1000",
"1000-1250", "1251-1780"]
python-version: [ 3.8 ]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
with:
fetch-depth: 1
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/test_valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,16 @@ jobs:
# TODO: prepare image with more deps preinstalled
runs-on: ubuntu-20.04

strategy:
matrix:
python-version: [ 3.8 ]

steps:
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- uses: actions/checkout@master
- run: git fetch --prune --unshallow

Expand Down
2 changes: 1 addition & 1 deletion documentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Graphics for documentation are kept in `documentation/gfx/`.

### When using Markdown

* Note that there are some incompatibilities of Github Markdown and Doxygen
* Note that there are some incompatibilities of GitHub Markdown and Doxygen
Markdown. Ideally documentation should be written in a format compatible with
both.
This affects for example images links which currently cause trouble in
Expand Down
Binary file modified documentation/gfx/amici_workflow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading