Skip to content

Use Python 3.10 in Continuous Integration tests #1577

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

Merged
merged 28 commits into from
Dec 27, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
eec37af
Update continuous integration workflows to use Python 3.10
weiji14 Oct 8, 2021
e197bde
Put quotes around 3.10 so that it doesn't get read as Python 3.1
weiji14 Oct 8, 2021
d73da3f
Merge branch 'main' into ci/python-3.10
weiji14 Oct 12, 2021
c7bca7d
Revert ci_docs and ci_tests to use Python 3.9
weiji14 Oct 12, 2021
2b9abf7
Manually install Python 3.10 on ci_tests_dev.yaml
weiji14 Oct 12, 2021
76bbf2c
Merge branch 'main' into ci/python-3.10
weiji14 Oct 16, 2021
00cafd7
Use pip to install dvc on ci_tests_dev workflow
weiji14 Oct 16, 2021
36ce2d3
Merge branch 'main' into ci/python-3.10
weiji14 Oct 21, 2021
f0e8e76
Merge branch 'main' into ci/python-3.10
weiji14 Oct 25, 2021
2ce685e
Use pip to install geopandas on ci_tests_dev workflow
weiji14 Oct 26, 2021
2a4f15a
Try with newer version of conda/mamba
weiji14 Oct 26, 2021
63cd1d0
Revert "Try with newer version of conda/mamba"
weiji14 Oct 26, 2021
57d42cc
Try flexible channel priority
weiji14 Oct 26, 2021
56d044b
Temporarily run GMT Dev Tests on pull request pushes
weiji14 Oct 26, 2021
bfd8527
Install numpy before other deps since it is a build dependency for some
weiji14 Oct 26, 2021
c32e6c9
Merge branch 'main' into ci/python-3.10
weiji14 Nov 5, 2021
20854ee
Prefer older binary pip packages over newer pip packages
weiji14 Nov 5, 2021
a462adc
Revert "Try flexible channel priority"
weiji14 Oct 26, 2021
31e8908
Install gdal Python package in addition to libgdal from conda-forge
weiji14 Nov 5, 2021
69d4e67
Install fiona instead of gdal
weiji14 Nov 5, 2021
0a9007d
Merge branch 'main' into ci/python-3.10
weiji14 Dec 4, 2021
0604c95
Revert "Use pip to install geopandas on ci_tests_dev workflow"
weiji14 Dec 4, 2021
f692874
Merge branch 'main' into ci/python-3.10
weiji14 Dec 7, 2021
b5a5ab5
Merge branch 'main' into ci/python-3.10
weiji14 Dec 20, 2021
a4b10af
Revert "Temporarily run GMT Dev Tests on pull request pushes"
weiji14 Oct 26, 2021
fca7a68
Remove quotes around python version numbers
weiji14 Dec 20, 2021
0772260
Merge branch 'main' into ci/python-3.10
weiji14 Dec 20, 2021
afed7c9
Set minimum Python version to 3.8 in README.rst
weiji14 Dec 20, 2021
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
4 changes: 2 additions & 2 deletions .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.9]
python-version: ['3.10']
os: [ubuntu-latest, macOS-latest, windows-latest]
# Is it a draft Pull Request (true or false)?
isDraft:
- ${{ github.event.pull_request.draft }}
# Only run one job (Ubuntu + Python 3.9) for draft PRs
# Only run one job (Ubuntu + Python 3.10) for draft PRs
exclude:
- os: macOS-latest
isDraft: true
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.9]
python-version: ['3.7', '3.10']
os: [ubuntu-latest, macOS-latest, windows-latest]
# Is it a draft Pull Request (true or false)?
isDraft:
- ${{ github.event.pull_request.draft }}
# Only run one job (Ubuntu + Python 3.9) for draft PRs
# Only run one job (Ubuntu + Python 3.10) for draft PRs
exclude:
- os: macOS-latest
isDraft: true
Expand All @@ -44,13 +44,13 @@ jobs:
# - os: ubuntu-latest
# python-version: 3.7
# isDraft: true
# Pair Python 3.7 with NumPy 1.18 and Python 3.9 with NumPy 1.21
# Only install optional packages on Python 3.9/NumPy 1.21
# Pair Python 3.7 with NumPy 1.18 and Python 3.10 with NumPy 1.21
# Only install optional packages on Python 3.10/NumPy 1.21
include:
- python-version: 3.7
- python-version: '3.7'
numpy-version: '1.18'
optional-packages: ''
- python-version: 3.9
- python-version: '3.10'
numpy-version: '1.21'
optional-packages: 'geopandas ipython'
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.9]
python-version: ['3.10']
os: [ubuntu-latest, macOS-11.0, windows-latest]
gmt_git_ref: [master]
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up Python
uses: actions/[email protected]
with:
python-version: 3.9
python-version: '3.10'

- name: Install dependencies
run: python -m pip install setuptools wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/style_checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Set up Python
uses: actions/[email protected]
with:
python-version: 3.9
python-version: '3.10'

- name: Install packages
run: |
Expand Down
2 changes: 1 addition & 1 deletion doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Now we can create a new conda environment with Python and all our dependencies
installed (we'll call it ``pygmt`` but feel free to change it to whatever you
want)::

conda create --name pygmt python=3.9 numpy pandas xarray netcdf4 packaging gmt
conda create --name pygmt python=3.10 numpy pandas xarray netcdf4 packaging gmt

Activate the environment by running the following (**do not forget this step!**)::

Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
PACKAGE_DATA = {"pygmt.tests": ["data/*", "baseline/*"]}

CLASSIFIERS = [
"Development Status :: 3 - Alpha",
"Development Status :: 4 - Beta",
"Intended Audience :: Science/Research",
"Intended Audience :: Developers",
"Intended Audience :: Education",
Expand All @@ -30,6 +30,7 @@
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
f"License :: OSI Approved :: {LICENSE}",
]
PLATFORMS = "Any"
Expand Down