From 143e988a3e9547b5db52ba23fb0ae1f7127d79dc Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 8 Mar 2021 05:21:32 -0500 Subject: [PATCH 1/2] ci: Stop checking for Python 2 docs artifacts. --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index 84fdb146a..62cdbfd6b 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -9,4 +9,4 @@ jobs: with: repo-token: ${{ secrets.GITHUB_TOKEN }} artifact-path: 0/docs/build/html/index.html - circleci-jobs: docs-python2,docs-python3 + circleci-jobs: docs-python3 From c4e19c8fecc6e79f9c9c5b2dd98b00ff0e203ed9 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 8 Mar 2021 05:22:18 -0500 Subject: [PATCH 2/2] ci: Don't allow proj 8 yet. We don't yet support the new API. --- .appveyor.yml | 2 +- .circleci/config.yml | 2 +- .github/workflows/ci-testing.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 904fcb7c7..5d6a7085a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ environment: matrix: - PYTHON_VERSION: "3.9" CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64" - PACKAGES: "cython numpy matplotlib-base proj pykdtree scipy" + PACKAGES: "cython numpy matplotlib-base proj=7 pykdtree scipy" install: # Install miniconda diff --git a/.circleci/config.yml b/.circleci/config.yml index 64c942c64..8f7cfe355 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,7 +36,7 @@ deps-run: &deps-install numpy \ owslib \ pillow \ - proj \ + 'proj<8' \ pyepsg \ pykdtree \ pyshp \ diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 704e60a6c..7163ecf1e 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -35,7 +35,7 @@ jobs: - name: Latest packages if: ${{ steps.minimum-packages.conclusion == 'skipped' }} run: | - echo "PACKAGES=cython fiona matplotlib-base numpy proj pykdtree scipy" >> $GITHUB_ENV + echo "PACKAGES=cython fiona matplotlib-base numpy proj<8 pykdtree scipy" >> $GITHUB_ENV - name: Coverage packages id: coverage diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80e93e961..4ae2ecbe9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: | - PACKAGES="cython fiona matplotlib-base numpy proj pykdtree scipy" + PACKAGES="cython fiona matplotlib-base numpy proj<8 pykdtree scipy" PACKAGES="$PACKAGES flufl.lock owslib pep8 pillow pyepsg pyshp pytest" PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm" PACKAGES="$PACKAGES setuptools_scm_git_archive shapely" @@ -37,4 +37,4 @@ jobs: uses: pypa/gh-action-pypi-publish@master with: user: __token__ - password: ${{ secrets.pypi_token }} \ No newline at end of file + password: ${{ secrets.pypi_token }}