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.

Sign up for GitHub

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

Extend support to Python 3.12 #484

Merged
merged 16 commits into from
Jun 18, 2024
Merged

Extend support to Python 3.12 #484

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2eb8ef7
Extend support to Python 3.12
santisoler Mar 22, 2024
d2c0b85
Bump Python version in pypi.yml
santisoler Mar 22, 2024
3d66f2b
Bump Python version in environment.yml
santisoler Mar 22, 2024
b650719
Merge branch 'main' into extend-py-3.12
santisoler Jun 11, 2024
c5b74e0
Replace 3.11 for 3.12 in style Action
santisoler Jun 11, 2024
c8f29de
Add 3.12 to list of classifiers in pyproject.toml
santisoler Jun 11, 2024
5210afa
Require verde >= 1.8.1
santisoler Jun 11, 2024
132b683
Merge branch 'main' into extend-py-3.12
santisoler Jun 14, 2024
7573be3
Merge branch 'main' into extend-py-3.12
santisoler Jun 17, 2024
96fbef1
Bump Numpy minimum version to 1.23
santisoler Jun 17, 2024
eaa7358
Bump minimum versions for sklearn and xarray
santisoler Jun 17, 2024
a337072
Require Numpy < 2.0.0
santisoler Jun 17, 2024
41c4004
Fix syntax for specifying versions in pyproject.toml
santisoler Jun 17, 2024
2083afe
Update examples in docstrings to support Numpy 2
santisoler Jun 18, 2024
1e6daf8
Unpin Numpy 2.0 in pyproject.toml
santisoler Jun 18, 2024
ef159b6
Merge branch 'main' into extend-py-3.12
santisoler Jun 18, 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
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
env:
REQUIREMENTS: env/requirements-build.txt env/requirements-docs.txt
PYTHON: "3.11"
PYTHON: "3.12"

steps:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.12"

- name: Install requirements
run: python -m pip install -r env/requirements-build.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install requirements
run: pip install -r env/requirements-style.txt
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.12"

- name: Install requirements
run: pip install -r env/requirements-style.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ jobs:
- dependencies: oldest
python: "3.8"
- dependencies: latest
python: "3.11"
python: "3.12"
- dependencies: optional
python: "3.11"
python: "3.12"
# test on macos-13 (x86) using oldest dependencies and python 3.8
- os: macos-13
dependencies: oldest
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: harmonica
channels:
- conda-forge
dependencies:
- python==3.10.*
- python==3.12.*
- pip
# Build
- build
Expand All @@ -13,7 +13,7 @@ dependencies:
- numba
- scipy
- scikit-learn
- verde>=1.7.0
- verde>=1.8.1
- xarray
- xrft>=1.0
- choclo>=0.1
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
requires-python = ">=3.8"
dependencies = [
Expand All @@ -35,7 +36,7 @@ dependencies = [
"scikit-learn >= 0.24",
"numba >= 0.52",
"xarray >= 0.16",
"verde >= 1.7",
"verde >= 1.8.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is required here? It's an issue with Verde only in Python 3.12 and Verde 1.7 should still work with previous Pythons.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what to do here. If you're running Python 3.12 you need Verde >= v1.8.1.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, you're right. I guess we should just bump the requirement here. It doesn't really have a huge impact and Verde 1.8 didn't break anything.

"xrft >= 1.0",
"choclo >= 0.1",
]
Expand Down
Loading