From 8afa59c2b107b410fb0c54809265f816c733e259 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Thu, 18 Feb 2021 22:43:09 -0500 Subject: [PATCH 1/7] Temporarily enable macOS and Windows --- .github/workflows/ci_tests.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 6f5caf0db1d..03e271f1f68 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -36,8 +36,16 @@ jobs: # Only run one job (Ubuntu + Python 3.9) for draft PRs exclude: - os: macOS-latest + python-version: 3.7 + isDraft: true + - os: macOS-latest + python-version: 3.8 isDraft: true - os: windows-latest + python-version: 3.7 + isDraft: true + - os: windows-latest + python-version: 3.8 isDraft: true - os: ubuntu-latest python-version: 3.7 From 2ebe871f9f238839109f551011cc1f8b836cfbc6 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 19 Feb 2021 15:05:30 -0500 Subject: [PATCH 2/7] Disable defaults channel --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 43d37065e06..87808e1b270 100644 --- a/environment.yml +++ b/environment.yml @@ -1,7 +1,7 @@ name: pygmt channels: - conda-forge - - defaults + - nodefaults dependencies: # Required dependencies - pip From 439a8e3ddacc185f64cc0a9752f8f45293eae823 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 19 Feb 2021 15:15:41 -0500 Subject: [PATCH 3/7] Install less packages --- environment.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/environment.yml b/environment.yml index 87808e1b270..ddf9acbb272 100644 --- a/environment.yml +++ b/environment.yml @@ -12,18 +12,9 @@ dependencies: - netCDF4 - packaging # Development dependencies - - black - - blackdoc - codecov - coverage[toml] - - docformatter - - flake8 - - ipython - - isort>=5 - - jupyter - make - - matplotlib - - pylint - pytest-cov - pytest-mpl - pytest>=6.0 From 6cea7ec6b4ce30958323657f09f6c15358f0dae2 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 19 Feb 2021 15:36:11 -0500 Subject: [PATCH 4/7] Add ipython back --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index ddf9acbb272..7a841c70ea1 100644 --- a/environment.yml +++ b/environment.yml @@ -14,6 +14,7 @@ dependencies: # Development dependencies - codecov - coverage[toml] + - ipython - make - pytest-cov - pytest-mpl From 7a7765c663f0c7fd1aa0542a549dc89c7f4e0dda Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 19 Feb 2021 16:17:04 -0500 Subject: [PATCH 5/7] Set environment-file --- .github/workflows/ci_tests.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 03e271f1f68..492fca8a382 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -81,11 +81,7 @@ jobs: python-version: ${{ matrix.python-version }} channels: conda-forge miniconda-version: "latest" - - # Install GMT and other required dependencies from conda-forge - - name: Install dependencies - shell: bash -l {0} - run: conda env update --file environment.yml + environment-file: environment.yml # Show installed pkg information for postmortem diagnostic - name: List installed packages From 26262cd8e397001ea778067b43df0709118e2c98 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 19 Feb 2021 20:04:42 -0500 Subject: [PATCH 6/7] Remove miniconda-version --- .github/workflows/ci_tests.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 492fca8a382..a30d254ef1f 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -79,8 +79,7 @@ jobs: with: activate-environment: pygmt python-version: ${{ matrix.python-version }} - channels: conda-forge - miniconda-version: "latest" + channels: conda-forge,nodefaults environment-file: environment.yml # Show installed pkg information for postmortem diagnostic From 7c76f4ba7b34537bd4092d1c95326ced61c119ac Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 19 Feb 2021 20:17:53 -0500 Subject: [PATCH 7/7] Remove channels --- .github/workflows/ci_tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index a30d254ef1f..39d586ffdcf 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -79,7 +79,6 @@ jobs: with: activate-environment: pygmt python-version: ${{ matrix.python-version }} - channels: conda-forge,nodefaults environment-file: environment.yml # Show installed pkg information for postmortem diagnostic