diff --git a/.github/workflows/cache_data.yaml b/.github/workflows/cache_data.yaml index 969198e4ef1..f0556b81196 100644 --- a/.github/workflows/cache_data.yaml +++ b/.github/workflows/cache_data.yaml @@ -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 diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index 706c2c22037..bf36a61573c 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -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 diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 1a40e4eaafe..9f46e649b70 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -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} @@ -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 }} \ diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index c2728dfbb0b..586ae5e3f11 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -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 diff --git a/environment.yml b/environment.yml index d44c2ff2fb8..09d2c6f8c79 100644 --- a/environment.yml +++ b/environment.yml @@ -6,7 +6,7 @@ channels: dependencies: # Required dependencies - pip - - gmt=6.2.0rc1 + - gmt=6.2.0rc2 - numpy>=1.17 - pandas - xarray