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

Support Python 3.9 #689

Merged
merged 4 commits into from
Nov 14, 2020
Merged

Support Python 3.9 #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6f0b93
Check compatibility with Python 3.9
weiji14 Nov 13, 2020
50eb7fc
Use Python 3.8 in environment.yml and style checks CI
weiji14 Nov 13, 2020
a5f4ebc
Run Python 3.6 tests on master branch only to conserve CI resources
weiji14 Nov 13, 2020
8cb0c0a
Update doc/install.rst
weiji14 Nov 14, 2020
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
10 changes: 8 additions & 2 deletions .github/workflows/ci_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.8

- name: Install packages
run: pip install black blackdoc flake8 pylint
Expand All @@ -42,8 +42,14 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: [3.6, 3.7, 3.8, 3.9]
os: [ubuntu-latest, macOS-latest, windows-latest]
# Run Python 3.6 tests on master branch only to conserve CI resources
isMaster:
- ${{ contains(github.ref, 'master') }}
exclude:
- isMaster: false # i.e. on Pull Requests
python-version: 3.6
Comment on lines +47 to +52
Copy link
Member

Choose a reason for hiding this comment

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

It looks good to me, but perhaps we have to change the branch protection rules?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, we'll need to change the required checks from 3.6 to 3.9 (keeping 3.7 and 3.8 intact). Will do so when ready to merge.

Copy link
Member

Choose a reason for hiding this comment

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

All CI jobs pass except the 3 that are excluded.
image

Copy link
Member Author

Choose a reason for hiding this comment

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

Ok, branch protection rules updated!

# environmental variables used in coverage
env:
OS: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.8]
python-version: [3.9]
os: [ubuntu-20.04, macOS-10.15]
gmt_git_ref: [master]
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-to-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.9

- name: Install dependencies
run: python -m pip install setuptools wheel
Expand Down
1 change: 0 additions & 1 deletion doc/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,3 @@ e.g. in a terminal run::
export GMT_LIBRARY_PATH=$HOME/anaconda3/envs/pygmt/lib
# Windows
set "GMT_LIBRARY_PATH=C:\Users\USERNAME\Anaconda3\envs\pygmt\Library\bin\"

2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.7
- python=3.8
seisman marked this conversation as resolved.
Show resolved Hide resolved
- pip
- gmt=6.1.1
- numpy
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"License :: OSI Approved :: {}".format(LICENSE),
]
PLATFORMS = "Any"
Expand Down