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

#599: Add support for python 3.12 continuation #640

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fdc25c3
add py312 and py313 to ci.yml
veenstrajelmer Feb 14, 2024
60e2a82
revert py313, update toml with py312
veenstrajelmer Feb 14, 2024
6b253bd
py312 target-version not yet supported by black, reverting
veenstrajelmer Feb 14, 2024
6f43deb
disabled poetry lockfile
veenstrajelmer Feb 14, 2024
821a7ee
reverted
veenstrajelmer Feb 14, 2024
f5f4633
Update ci.yml to use poetry 1.7.1
priscavdsluis Feb 14, 2024
c29e8b1
temporary higher version of numpy that supports py3.12
veenstrajelmer Feb 14, 2024
a8daaa2
delete poetry.lock
veenstrajelmer Feb 14, 2024
d240e2a
different numpy versions per python version
veenstrajelmer Feb 14, 2024
ff2bcba
disable cache
veenstrajelmer Feb 14, 2024
bf78d64
revert py-dependent numpy versions
veenstrajelmer Feb 14, 2024
ac16b16
temporarily add pyzmq to toml and re-enable cache
veenstrajelmer Feb 14, 2024
d9de45d
temporarily higher numpy
veenstrajelmer Feb 14, 2024
2e4b760
revert higher numpy and pyzmq
veenstrajelmer Feb 14, 2024
1c8a657
fixed conflicts with main
veenstrajelmer Apr 29, 2024
add11b6
fixed conflicts with main
veenstrajelmer Apr 29, 2024
0710f6d
test black target version py312
veenstrajelmer Apr 29, 2024
9356de3
revert, not supported
veenstrajelmer Apr 29, 2024
5a1834c
fixed conflict
veenstrajelmer Apr 29, 2024
69dc431
update to abatilo/actions-poetry@v3
veenstrajelmer May 2, 2024
ffdfd2b
update to poetry-version: 1.8.2
veenstrajelmer May 2, 2024
00502e3
revert
veenstrajelmer May 2, 2024
fb3d60e
update to abatilo/actions-poetry@v2 and poetry-version: 1.8.2
veenstrajelmer May 2, 2024
2e4c368
removed dependencies
veenstrajelmer May 2, 2024
b604e72
revert
veenstrajelmer May 2, 2024
11ad29e
feat (599) try to update poetry toml to python 3.12
MRVermeulenDeltares May 3, 2024
0b3aa71
feat (599) try to enforce specifc numpy versions for specifc python v…
MRVermeulenDeltares May 3, 2024
8fed810
feat (599) revert black upgrade to py312, not yet supported it seems.
MRVermeulenDeltares May 3, 2024
3e914a9
feat (599) update documentation to state CI will run on 3.8, 3.9 and …
MRVermeulenDeltares May 3, 2024
95ebe27
feat (599) Dissable actions for python version 3.10 and 3.11
MRVermeulenDeltares May 6, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.12"]
os: [ubuntu-latest, windows-latest, macos-13]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -21,9 +21,9 @@ jobs:
python-version: ${{ matrix.python-version }}

- name: Run image
uses: abatilo/actions-poetry@v2.3.0
uses: abatilo/actions-poetry@v2
with:
poetry-version: 1.4.0
poetry-version: 1.8.2
- name: Cache Poetry virtualenv
uses: actions/cache@v3
id: cache
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ When starting development on a branch, a pull request should be created for revi
In the description text area on GitHub, use a [closing keyword](https://docs.github.com/articles/closing-issues-using-keywords) such that this PR will be automatically linked to the issue.
For example: `Fixes #160`.

During continuous integration, the checks will be run with python 3.8-3.11 on Windows, Ubuntu and MacOS. The checks consist of running the tests, checking the code formatting and running SonarCloud.
During continuous integration, the checks will be run with python 3.8, 3.9 and 3.12 on Windows, Ubuntu and MacOS. The checks consist of running the tests, checking the code formatting and running SonarCloud.
We advise to use a draft pull request, to prevent the branch to be merged back before developement is finished. When the branch is ready for review, you can update the status of the pull request to "ready for review".

### Reviews
Expand Down
Loading
Loading