From 2a014f3797ca4909e199f9137c2022ef4bd93d33 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 22 Mar 2021 20:48:51 -0400 Subject: [PATCH 1/5] Synchronize recent changes in ci_tests.yaml to ci_tests_dev.yaml - Add more paths to `paths-ignore` - Change "ubuntu-20.04" to "ubuntu-latest", "macOs-10.15" to "macOS-latest" - Add "activate-environment: pygmt" to the setup-miniconda step - Install PyGMT dependencies from conda-forge, not pip --- .github/workflows/ci_tests_dev.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index d106dac1fe6..1e48bb777f4 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -1,5 +1,4 @@ -# This workflow installs PyGMT dependencies, builds documentation and runs tests on GMT dev version -# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions +# This workflow installs PyGMT and runs tests on GMT dev version name: GMT Dev Tests @@ -10,10 +9,13 @@ on: types: [ready_for_review] paths-ignore: - 'doc/**' + - 'examples/**' - '*.md' - '*.json' - 'README.rst' - 'LICENSE.txt' + - '.gitignore' + - '.pylintrc' repository_dispatch: types: [test-gmt-dev-command] # Schedule daily tests @@ -28,7 +30,7 @@ jobs: fail-fast: false matrix: python-version: [3.9] - os: [ubuntu-20.04, macOS-10.15, windows-latest] + os: [ubuntu-latest, macOS-latest, windows-latest] gmt_git_ref: [master] defaults: run: @@ -73,6 +75,7 @@ jobs: - name: Setup Miniconda uses: conda-incubator/setup-miniconda@v2.0.1 with: + activate-environment: pygmt python-version: ${{ matrix.python-version }} channels: conda-forge miniconda-version: "latest" @@ -81,8 +84,11 @@ jobs: - name: Install dependencies run: | conda install ninja cmake libblas libcblas liblapack fftw gdal \ - ghostscript libnetcdf hdf5 zlib curl pcre ipython \ - dvc pytest pytest-cov pytest-mpl + ghostscript libnetcdf hdf5 zlib curl pcre \ + numpy pandas xarray netCDF4 packaging \ + dvc ipython make \ + pytest-cov pytest-mpl pytest>=6.0 \ + sphinx-gallery # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) From 89f96b8b0a79a5ea797394c29b0f7d8895b57de6 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 22 Mar 2021 22:32:05 -0400 Subject: [PATCH 2/5] Install Python pacakges using pip --- .github/workflows/ci_tests_dev.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 1e48bb777f4..e0c8f2ef3de 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -84,11 +84,9 @@ jobs: - name: Install dependencies run: | conda install ninja cmake libblas libcblas liblapack fftw gdal \ - ghostscript libnetcdf hdf5 zlib curl pcre \ - numpy pandas xarray netCDF4 packaging \ - dvc ipython make \ - pytest-cov pytest-mpl pytest>=6.0 \ - sphinx-gallery + ghostscript libnetcdf hdf5 zlib curl pcre make + pip install numpy pandas xarray netCDF4 packaging \ + dvc ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS) From 53479377596ed19e0bebf358e7323c202eeceedc Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 22 Mar 2021 22:45:10 -0400 Subject: [PATCH 3/5] Use macOS-11.0 Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com> --- .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 e0c8f2ef3de..4947e6b36b6 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -30,7 +30,7 @@ jobs: fail-fast: false matrix: python-version: [3.9] - os: [ubuntu-latest, macOS-latest, windows-latest] + os: [ubuntu-latest, macOS-11.0, windows-latest] gmt_git_ref: [master] defaults: run: From 43845b0d06e8df07ba4a78accf98330f4a26a087 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Mon, 22 Mar 2021 23:54:23 -0400 Subject: [PATCH 4/5] pip install --pre Co-authored-by: Wei Ji <23487320+weiji14@users.noreply.github.com> --- .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 4947e6b36b6..f532b947081 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -85,7 +85,7 @@ jobs: run: | conda install ninja cmake libblas libcblas liblapack fftw gdal \ ghostscript libnetcdf hdf5 zlib curl pcre make - pip install numpy pandas xarray netCDF4 packaging \ + pip install --pre numpy pandas xarray netCDF4 packaging \ dvc ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery # Build and install latest GMT from GitHub From f4d70292269b36d6fabdb982dda0438fc179d067 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 23 Mar 2021 01:04:02 -0400 Subject: [PATCH 5/5] Install dvc using conda --- .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 f532b947081..fe072c01fdb 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -84,9 +84,9 @@ jobs: - name: Install dependencies run: | conda install ninja cmake libblas libcblas liblapack fftw gdal \ - ghostscript libnetcdf hdf5 zlib curl pcre make + ghostscript libnetcdf hdf5 zlib curl pcre make dvc pip install --pre numpy pandas xarray netCDF4 packaging \ - dvc ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery + ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery # Build and install latest GMT from GitHub - name: Install GMT ${{ matrix.gmt_git_ref }} branch (Linux/macOS)