Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backports for 0.20.x #2059

Merged
merged 5 commits into from
Jun 29, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ install:
- conda config --add channels conda-forge/label/testing
- set ENV_NAME=test-environment
- set PACKAGES=%PACKAGES% flufl.lock owslib pep8 pillow pyshp pytest
- set PACKAGES=%PACKAGES% requests setuptools_scm setuptools_scm_git_archive
- set PACKAGES=%PACKAGES% shapely
- set PACKAGES=%PACKAGES% requests setuptools_scm shapely
- conda create -n %ENV_NAME% python=%PYTHON_VERSION% %PACKAGES%
- activate %ENV_NAME%
- set INCLUDE=%CONDA_PREFIX%\Library\include;%INCLUDE%
Expand Down
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ deps-run: &deps-install
requests \
scipy \
setuptools_scm \
setuptools_scm_git_archive \
shapely \
$EXTRA_PACKAGES \
--file docs/doc-requirements.txt
Expand Down
1 change: 0 additions & 1 deletion .git_archival.txt

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/ci-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ jobs:
- name: Install dependencies
run: |
PACKAGES="$PACKAGES flufl.lock owslib pep8 pillow pyshp pytest"
PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm shapely"
# openssl 3.0 updated the legacy renegotiation default, which causes
# failures in NASA's WMTS server. They will need to update their
# server before we can use a newer openssl.
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ jobs:
run: |
PACKAGES="cython fiona matplotlib-base numpy pyproj pykdtree scipy"
PACKAGES="$PACKAGES flufl.lock owslib pep8 pillow pyshp pytest"
PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm shapely"
conda install $PACKAGES

- name: Create sdist
Expand Down
3 changes: 1 addition & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ requires = [
"setuptools >= 40.6.0",
"Cython >= 0.29.13",
"oldest-supported-numpy",
"setuptools_scm",
"setuptools_scm_git_archive",
"setuptools_scm >= 7.0.0",
]
build-backend = "setuptools.build_meta"