Skip to content

Commit

Permalink
Merge pull request #1742 from QuLogic/fix-ci
Browse files Browse the repository at this point in the history
ci: Don't allow proj 8 yet
  • Loading branch information
greglucas authored Mar 8, 2021
2 parents 172de00 + c4e19c8 commit 902932c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ deps-run: &deps-install
numpy \
owslib \
pillow \
proj \
'proj<8' \
pyepsg \
pykdtree \
pyshp \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/circleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -37,4 +37,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@master
with:
user: __token__
password: ${{ secrets.pypi_token }}
password: ${{ secrets.pypi_token }}

0 comments on commit 902932c

Please sign in to comment.