From eec37af038a6e1abe510c86797534251bcd4e21b Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 8 Oct 2021 14:02:29 +1300 Subject: [PATCH 01/19] Update continuous integration workflows to use Python 3.10 Python 3.10 has been released on 7 October 2021, see changelog at https://docs.python.org/3.10/whatsnew/3.10.html. Updating all the GitHub Actions continuous integration workflows that used Python 3.9 to use Python 3.10 now. Also updated setup.py to include Python 3.10 classifier. --- .github/workflows/ci_docs.yml | 4 ++-- .github/workflows/ci_tests.yaml | 12 ++++++------ .github/workflows/ci_tests_dev.yaml | 2 +- .github/workflows/publish-to-pypi.yml | 2 +- .github/workflows/style_checks.yaml | 2 +- doc/install.rst | 2 +- setup.py | 3 ++- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index 5bcedde5433..b4d888e2d61 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -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 diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 61a859b5042..a6ffe6d970e 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -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 @@ -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: diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 287d70fae9e..3cd6c4df293 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -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: diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 66ae283cdac..b5b741295f1 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2.2.2 with: - python-version: 3.9 + python-version: 3.10 - name: Install dependencies run: python -m pip install setuptools wheel diff --git a/.github/workflows/style_checks.yaml b/.github/workflows/style_checks.yaml index 234e7de4fe8..55da1bcc5e9 100644 --- a/.github/workflows/style_checks.yaml +++ b/.github/workflows/style_checks.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2.2.2 with: - python-version: 3.9 + python-version: 3.10 - name: Install packages run: | diff --git a/doc/install.rst b/doc/install.rst index f8e37fc0fb7..5c7b804e18f 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -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!**):: diff --git a/setup.py b/setup.py index bc47cd0df88..3a2e261af3f 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -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" From e197bdebed9392ffcdf80e247b1a7a60664d0aee Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 8 Oct 2021 14:10:03 +1300 Subject: [PATCH 02/19] Put quotes around 3.10 so that it doesn't get read as Python 3.1 --- .github/workflows/ci_docs.yml | 2 +- .github/workflows/ci_tests.yaml | 2 +- .github/workflows/ci_tests_dev.yaml | 2 +- .github/workflows/publish-to-pypi.yml | 2 +- .github/workflows/style_checks.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index b4d888e2d61..e83d8e938a4 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.10] + python-version: ['3.10'] os: [ubuntu-latest, macOS-latest, windows-latest] # Is it a draft Pull Request (true or false)? isDraft: diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index a6ffe6d970e..9b4be525ab1 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.10] + python-version: ['3.7', '3.10'] os: [ubuntu-latest, macOS-latest, windows-latest] # Is it a draft Pull Request (true or false)? isDraft: diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 3cd6c4df293..8732933435b 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.10] + python-version: ['3.10'] os: [ubuntu-latest, macOS-11.0, windows-latest] gmt_git_ref: [master] defaults: diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index b5b741295f1..314d3a27193 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2.2.2 with: - python-version: 3.10 + python-version: '3.10' - name: Install dependencies run: python -m pip install setuptools wheel diff --git a/.github/workflows/style_checks.yaml b/.github/workflows/style_checks.yaml index 55da1bcc5e9..db6e9722691 100644 --- a/.github/workflows/style_checks.yaml +++ b/.github/workflows/style_checks.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2.2.2 with: - python-version: 3.10 + python-version: '3.10' - name: Install packages run: | From c7bca7d1aff5a1aa103b3b75cf23196f2df7de36 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 13 Oct 2021 10:01:05 +1300 Subject: [PATCH 03/19] Revert ci_docs and ci_tests to use Python 3.9 Partially reverts eec37af038a6e1abe510c86797534251bcd4e21b. --- .github/workflows/ci_docs.yml | 4 ++-- .github/workflows/ci_tests.yaml | 10 +++++----- doc/install.rst | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index e83d8e938a4..a60bac9a46f 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -25,12 +25,12 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.10'] + python-version: ['3.9'] 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.10) for draft PRs + # Only run one job (Ubuntu + Python 3.9) for draft PRs exclude: - os: macOS-latest isDraft: true diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 9b4be525ab1..2d637a1b96b 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -30,12 +30,12 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.10'] + python-version: ['3.7', '3.9'] 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.10) for draft PRs + # Only run one job (Ubuntu + Python 3.9) for draft PRs exclude: - os: macOS-latest isDraft: true @@ -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.10 with NumPy 1.21 - # Only install optional packages on Python 3.10/NumPy 1.21 + # 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 include: - python-version: '3.7' numpy-version: '1.18' optional-packages: '' - - python-version: '3.10' + - python-version: '3.9' numpy-version: '1.21' optional-packages: 'geopandas ipython' defaults: diff --git a/doc/install.rst b/doc/install.rst index 5c7b804e18f..f8e37fc0fb7 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -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.10 numpy pandas xarray netcdf4 packaging gmt + conda create --name pygmt python=3.9 numpy pandas xarray netcdf4 packaging gmt Activate the environment by running the following (**do not forget this step!**):: From 2b9abf775c36057f3e6d49bb9e9c612686ac26de Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 13 Oct 2021 10:02:25 +1300 Subject: [PATCH 04/19] Manually install Python 3.10 on ci_tests_dev.yaml --- .github/workflows/ci_tests_dev.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 8732933435b..0637103eab7 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -76,7 +76,7 @@ jobs: uses: conda-incubator/setup-miniconda@v2.1.1 with: activate-environment: pygmt - python-version: ${{ matrix.python-version }} + # python-version: ${{ matrix.python-version }} channels: conda-forge,nodefaults channel-priority: strict miniforge-version: latest @@ -87,7 +87,8 @@ jobs: # Install dependencies from conda-forge - name: Install dependencies run: | - mamba install ninja cmake libblas libcblas liblapack fftw gdal geopandas \ + mamba install python=${{ matrix.python-version }} \ + ninja cmake libblas libcblas liblapack fftw gdal geopandas \ ghostscript libnetcdf hdf5 zlib curl pcre make dvc=2.3.0 pip install --pre numpy pandas xarray netCDF4 packaging \ ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery \ From 00cafd7df5bd1aef47687dbaa9b73980bf0af1d1 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sat, 16 Oct 2021 20:59:38 +1300 Subject: [PATCH 05/19] Use pip to install dvc on ci_tests_dev workflow Workaround missing Python 3.10 packages for dvc on conda-forge. --- .github/workflows/ci_tests_dev.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 760b0083edd..cbcbdffba2b 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -89,10 +89,10 @@ jobs: run: | mamba install python=${{ matrix.python-version }} \ ninja cmake libblas libcblas liblapack fftw gdal geopandas \ - ghostscript libnetcdf hdf5 zlib curl pcre make dvc + ghostscript libnetcdf hdf5 zlib curl pcre make pip install --pre numpy pandas xarray netCDF4 packaging \ - ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery \ - tomli + dvc ipython pytest-cov pytest-mpl pytest>=6.0 \ + sphinx-gallery tomli # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) From 2ce685e5a9c15ea616ff4bf0a2ee296054d23020 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 14:56:24 +1300 Subject: [PATCH 06/19] Use pip to install geopandas on ci_tests_dev workflow Also installing libgdal instead of gdal from conda-forge. --- .github/workflows/ci_tests_dev.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 05656d8102a..86c0634f5ae 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -88,11 +88,11 @@ jobs: - name: Install dependencies run: | mamba install python=${{ matrix.python-version }} \ - ninja cmake libblas libcblas liblapack fftw gdal geopandas \ + ninja cmake libblas libcblas liblapack fftw libgdal \ ghostscript libnetcdf hdf5 zlib curl pcre make pip install --pre numpy pandas xarray netCDF4 packaging \ - dvc ipython pytest-cov pytest-mpl pytest>=6.0 \ - sphinx-gallery tomli + dvc geopandas ipython 'pytest>=6.0' pytest-cov \ + pytest-mpl sphinx-gallery tomli # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) From 2a4f15a2f5594aeb91fbfe29742e3e72d3e82458 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:06:58 +1300 Subject: [PATCH 07/19] Try with newer version of conda/mamba --- .github/workflows/ci_tests_dev.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 86c0634f5ae..79f253fa858 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -75,6 +75,7 @@ jobs: - name: Setup Mambaforge uses: conda-incubator/setup-miniconda@v2.1.1 with: + auto-update-conda: true activate-environment: pygmt # python-version: ${{ matrix.python-version }} channels: conda-forge,nodefaults From 63cd1d0e5c90bee5f88771a4b96079d4cbf10590 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:06:58 +1300 Subject: [PATCH 08/19] Revert "Try with newer version of conda/mamba" This reverts commit 2a4f15a2f5594aeb91fbfe29742e3e72d3e82458. --- .github/workflows/ci_tests_dev.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 79f253fa858..86c0634f5ae 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -75,7 +75,6 @@ jobs: - name: Setup Mambaforge uses: conda-incubator/setup-miniconda@v2.1.1 with: - auto-update-conda: true activate-environment: pygmt # python-version: ${{ matrix.python-version }} channels: conda-forge,nodefaults From 57d42cc83e101642751f97479eb297e1fd536294 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:23:48 +1300 Subject: [PATCH 09/19] Try flexible channel priority --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 86c0634f5ae..5100abdfd6e 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -78,7 +78,7 @@ jobs: activate-environment: pygmt # python-version: ${{ matrix.python-version }} channels: conda-forge,nodefaults - channel-priority: strict + channel-priority: flexible miniforge-version: latest miniforge-variant: Mambaforge mamba-version: "*" From 56d044b487cac7c48cfa1fd2bfa04b03278b9b44 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:34:48 +1300 Subject: [PATCH 10/19] Temporarily run GMT Dev Tests on pull request pushes --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 5100abdfd6e..59823844d4d 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -6,7 +6,7 @@ on: # push: # branches: [ main ] pull_request: - types: [ready_for_review] + types: [opened, reopened, synchronize, ready_for_review] paths-ignore: - 'doc/**' - 'examples/**' From bfd85270b77ba38bd2d653753864eec3474cca2f Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:35:51 +1300 Subject: [PATCH 11/19] Install numpy before other deps since it is a build dependency for some --- .github/workflows/ci_tests_dev.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 59823844d4d..5082b3f1430 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -90,7 +90,8 @@ jobs: mamba install python=${{ matrix.python-version }} \ ninja cmake libblas libcblas liblapack fftw libgdal \ ghostscript libnetcdf hdf5 zlib curl pcre make - pip install --pre numpy pandas xarray netCDF4 packaging \ + pip install --pre numpy + pip install --pre pandas xarray netCDF4 packaging \ dvc geopandas ipython 'pytest>=6.0' pytest-cov \ pytest-mpl sphinx-gallery tomli From 20854ee83ee862a185c8c9054ae75ff71ee53abb Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 5 Nov 2021 16:45:04 +1300 Subject: [PATCH 12/19] Prefer older binary pip packages over newer pip packages Save from having to compile Python 3.10 packages, and fixes installation issues for some libraries like `aiohttp` which have outdated pre-release versions. --- .github/workflows/ci_tests_dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index e94d251f2bb..e300252ac08 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -90,10 +90,10 @@ jobs: mamba install python=${{ matrix.python-version }} \ ninja cmake libblas libcblas liblapack fftw libgdal \ ghostscript libnetcdf hdf5 zlib curl pcre make - pip install --pre numpy - pip install --pre pandas xarray netCDF4 packaging \ - dvc geopandas ipython 'pytest>=6.0' pytest-cov \ - pytest-mpl sphinx-gallery tomli + pip install --pre --prefer-binary \ + numpy pandas xarray netCDF4 packaging \ + dvc geopandas ipython 'pytest>=6.0' pytest-cov \ + pytest-mpl sphinx-gallery tomli # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) From a462adcc284f3177b6331579ceb9270e60f55b1f Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:23:48 +1300 Subject: [PATCH 13/19] Revert "Try flexible channel priority" This reverts commit 57d42cc83e101642751f97479eb297e1fd536294. --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index e300252ac08..73b5a77bc8d 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -78,7 +78,7 @@ jobs: activate-environment: pygmt # python-version: ${{ matrix.python-version }} channels: conda-forge,nodefaults - channel-priority: flexible + channel-priority: strict miniforge-version: latest miniforge-variant: Mambaforge mamba-version: "*" From 31e89084758d51f49b52a5a096d7b050a81e27d6 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:14:02 +1300 Subject: [PATCH 14/19] Install gdal Python package in addition to libgdal from conda-forge --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 73b5a77bc8d..56bb5f39f81 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -92,7 +92,7 @@ jobs: ghostscript libnetcdf hdf5 zlib curl pcre make pip install --pre --prefer-binary \ numpy pandas xarray netCDF4 packaging \ - dvc geopandas ipython 'pytest>=6.0' pytest-cov \ + dvc gdal geopandas ipython 'pytest>=6.0' pytest-cov \ pytest-mpl sphinx-gallery tomli # Build and install latest GMT from GitHub From 69d4e6716b964c96fd4b158fe6ac986bbdbb9300 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:30:07 +1300 Subject: [PATCH 15/19] Install fiona instead of gdal --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 56bb5f39f81..15c44dd5fbc 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -92,7 +92,7 @@ jobs: ghostscript libnetcdf hdf5 zlib curl pcre make pip install --pre --prefer-binary \ numpy pandas xarray netCDF4 packaging \ - dvc gdal geopandas ipython 'pytest>=6.0' pytest-cov \ + dvc fiona geopandas ipython 'pytest>=6.0' pytest-cov \ pytest-mpl sphinx-gallery tomli # Build and install latest GMT from GitHub From 0604c950fac47b00cb7d6fcfc0fc15ef7e3a8498 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Sat, 4 Dec 2021 22:02:34 +1300 Subject: [PATCH 16/19] Revert "Use pip to install geopandas on ci_tests_dev workflow" This reverts commit 2ce685e5a9c15ea616ff4bf0a2ee296054d23020. --- .github/workflows/ci_tests_dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index f38f9bc1064..0a28f5b064b 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -89,10 +89,10 @@ jobs: run: | mamba install python=${{ matrix.python-version }} \ ninja cmake libblas libcblas liblapack fftw libgdal \ - ghostscript libnetcdf hdf5 zlib curl pcre make + geopandas ghostscript libnetcdf hdf5 zlib curl pcre make pip install --pre --prefer-binary \ numpy pandas xarray netCDF4 packaging \ - dvc fiona geopandas ipython 'pytest>=6.0' pytest-cov \ + dvc ipython 'pytest>=6.0' pytest-cov \ pytest-mpl sphinx-gallery tomli # Build and install latest GMT from GitHub From a4b10af90d0f61093a89407ef73ed3f790460aaa Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 26 Oct 2021 15:34:48 +1300 Subject: [PATCH 17/19] Revert "Temporarily run GMT Dev Tests on pull request pushes" This reverts commit 56d044b487cac7c48cfa1fd2bfa04b03278b9b44. --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 6c1b4ce5abe..19eac1128d3 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -6,7 +6,7 @@ on: # push: # branches: [ main ] pull_request: - types: [opened, reopened, synchronize, ready_for_review] + types: [ready_for_review] paths-ignore: - 'doc/**' - 'examples/**' From fca7a689947191ffa694d184901a8f4e9559e47c Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Mon, 20 Dec 2021 20:14:55 +1300 Subject: [PATCH 18/19] Remove quotes around python version numbers Prevent conflict with #1676. --- .github/workflows/ci_tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index b65b8888ce5..c725cb3e30b 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -30,7 +30,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.9'] + python-version: [3.7, 3.9] os: [ubuntu-latest, macOS-latest, windows-latest] # Is it a draft Pull Request (true or false)? isDraft: @@ -47,10 +47,10 @@ jobs: # 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 include: - - python-version: '3.7' + - python-version: 3.7 numpy-version: '1.18' optional-packages: '' - - python-version: '3.9' + - python-version: 3.9 numpy-version: '1.21' optional-packages: 'geopandas ipython' timeout-minutes: 30 From afed7c9046c0fb0399926733ec58110eb56b1d3c Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 21 Dec 2021 10:49:01 +1300 Subject: [PATCH 19/19] Set minimum Python version to 3.8 in README.rst Patches #1676 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 3ddb963e25f..54d1ab73e24 100644 --- a/README.rst +++ b/README.rst @@ -218,7 +218,7 @@ Compatibility with GMT/Python/NumPy versions * - `Dev `_ (upcoming release) - `Dev Documentation `_ (reflects `main branch `_) - >=6.3.0 - - >=3.7 + - >=3.8 - >=1.19 * - `v0.5.0 `_ (latest release) - `v0.5.0 Documentation `_