Skip to content

Commit

Permalink
Bump GMT version from 6.2.0rc1 to 6.2.0rc2 in CI (#1290)
Browse files Browse the repository at this point in the history
Second release candidate of Generic Mapping Tools v6.2.0 at
https://github.com/GenericMappingTools/gmt/releases/tag/6.2.0rc2.

* Bump GMT version from 6.2.0rc1 to 6.2.0rc2 in ci_tests.yaml and ci_tests_dev.yaml
* Bump GMT version from 6.1.1 to 6.2.0rc2 in cache data workflow

* Temporarily remove optional geopandas dependency from ci_tests.yaml
* Install geopandas in ci_tests_dev.yaml

Also temporarily pinning to gdal=3.2 so that geopandas and gmt can co-exist.
  • Loading branch information
weiji14 authored May 25, 2021
1 parent 1cbaebd commit 7c29e60
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cache_data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

# Install GMT
- name: Install GMT
run: conda install -c conda-forge gmt=6.1.1
run: conda install -c conda-forge/label/dev gmt=6.2.0rc2

# Download remote files
- name: Download remote data
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
# Install GMT and other required dependencies from conda-forge
- name: Install dependencies
run: |
conda install conda-forge/label/dev::gmt=6.2.0rc1 \
conda install conda-forge/label/dev::gmt=6.2.0rc2 \
numpy pandas xarray netCDF4 packaging \
ipython make myst-parser \
sphinx sphinx-copybutton sphinx-gallery sphinx_rtd_theme
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
optional-packages: ''
- python-version: 3.9
numpy-version: '1.20'
optional-packages: 'geopandas'
optional-packages: '' # 'geopandas'
defaults:
run:
shell: bash -l {0}
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
# Install GMT and other required dependencies from conda-forge
- name: Install dependencies
run: |
conda install conda-forge/label/dev::gmt=6.2.0rc1 \
conda install conda-forge/label/dev::gmt=6.2.0rc2 \
numpy=${{ matrix.numpy-version }} \
pandas xarray netCDF4 packaging \
${{ matrix.optional-packages }} \
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 @@ -83,7 +83,7 @@ jobs:
# Install dependencies from conda-forge
- name: Install dependencies
run: |
conda install ninja cmake libblas libcblas liblapack fftw gdal \
conda install ninja cmake libblas libcblas liblapack fftw gdal=3.2 geopandas \
ghostscript libnetcdf hdf5 zlib curl pcre make dvc
pip install --pre numpy pandas xarray netCDF4 packaging \
ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
# Required dependencies
- pip
- gmt=6.2.0rc1
- gmt=6.2.0rc2
- numpy>=1.17
- pandas
- xarray
Expand Down

0 comments on commit 7c29e60

Please sign in to comment.