Skip to content

Commit d27a42d

Browse files
authored
Support Python 3.9 (#689)
Test PyGMT with Python 3.9 * Use Python 3.8 in environment.yml and style checks CI * Run Python 3.6 tests on master branch only to conserve CI resources
1 parent c7c5eae commit d27a42d

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

.github/workflows/ci_tests.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Python
2626
uses: actions/setup-python@v2
2727
with:
28-
python-version: 3.7
28+
python-version: 3.8
2929

3030
- name: Install packages
3131
run: pip install black blackdoc flake8 pylint
@@ -42,8 +42,14 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
matrix:
45-
python-version: [3.6, 3.7, 3.8]
45+
python-version: [3.6, 3.7, 3.8, 3.9]
4646
os: [ubuntu-latest, macOS-latest, windows-latest]
47+
# Run Python 3.6 tests on master branch only to conserve CI resources
48+
isMaster:
49+
- ${{ contains(github.ref, 'master') }}
50+
exclude:
51+
- isMaster: false # i.e. on Pull Requests
52+
python-version: 3.6
4753
# environmental variables used in coverage
4854
env:
4955
OS: ${{ matrix.os }}

.github/workflows/ci_tests_dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
python-version: [3.8]
22+
python-version: [3.9]
2323
os: [ubuntu-20.04, macOS-10.15]
2424
gmt_git_ref: [master]
2525
env:

.github/workflows/publish-to-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up Python
3131
uses: actions/setup-python@v2
3232
with:
33-
python-version: 3.8
33+
python-version: 3.9
3434

3535
- name: Install dependencies
3636
run: python -m pip install setuptools wheel

doc/install.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,3 @@ e.g. in a terminal run::
138138
export GMT_LIBRARY_PATH=$HOME/anaconda3/envs/pygmt/lib
139139
# Windows
140140
set "GMT_LIBRARY_PATH=C:\Users\USERNAME\Anaconda3\envs\pygmt\Library\bin\"
141-

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6-
- python=3.7
6+
- python=3.8
77
- pip
88
- gmt=6.1.1
99
- numpy

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
"Programming Language :: Python :: 3.6",
3939
"Programming Language :: Python :: 3.7",
4040
"Programming Language :: Python :: 3.8",
41+
"Programming Language :: Python :: 3.9",
4142
"License :: OSI Approved :: {}".format(LICENSE),
4243
]
4344
PLATFORMS = "Any"

0 commit comments

Comments
 (0)