Update to latest version (#2101991)
This commit is contained in:
Elliott Sales de Andrade
parent
250c76973d
commit
996cfd1bc1
7 changed files with 113 additions and 11 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -11,3 +11,4 @@
|
|||
/Cartopy-0.20.0.tar.gz
|
||||
/Cartopy-0.20.1.tar.gz
|
||||
/Cartopy-0.20.2.tar.gz
|
||||
/Cartopy-0.20.3.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From cd8908e8bab3827e6f8bb8e5d9b25bbd9db0aa18 Mon Sep 17 00:00:00 2001
|
||||
From 722b2ba6dc28d73aeb2ca8cc7d42178ae0410899 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 26 Feb 2018 02:42:50 -0500
|
||||
Subject: [PATCH 1/3] Increase tolerance for new FreeType.
|
||||
Subject: [PATCH 1/4] Increase tolerance for new FreeType.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
|
|
@ -112,5 +112,5 @@ index 2eb6c470..46570324 100644
|
|||
fig = plt.figure(figsize=(10, 10))
|
||||
projections = (ccrs.PlateCarree(),
|
||||
--
|
||||
2.35.1
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From a8cbc0491cae37c166a09b44a8e664b60dd55a39 Mon Sep 17 00:00:00 2001
|
||||
From e589a1a90a13b0f0726885c78307d72c7bc507b5 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Sat, 21 May 2022 01:36:44 -0400
|
||||
Subject: [PATCH 2/3] Use pkg-config to find GEOS instead of geos-config
|
||||
Subject: [PATCH 2/4] Use pkg-config to find GEOS instead of geos-config
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
|
|
@ -28,5 +28,5 @@ index 6517b5e4..2bd3b5f3 100644
|
|||
warnings.warn(
|
||||
'Unable to determine GEOS version. Ensure you have %s or later '
|
||||
--
|
||||
2.35.1
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From af70de7feda043e45d150aadb6cedbc67c925e47 Mon Sep 17 00:00:00 2001
|
||||
From 05e742c7be204919bd71a5cb68388f51ea8e1055 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Mon, 23 May 2022 02:42:38 -0400
|
||||
Subject: [PATCH 3/3] Remove extraneous insertion of default compiler paths
|
||||
Subject: [PATCH 3/4] Remove extraneous insertion of default compiler paths
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
|
|
@ -51,5 +51,5 @@ index 2bd3b5f3..92a70a68 100644
|
|||
**extra_extension_args),
|
||||
]
|
||||
--
|
||||
2.35.1
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
95
0004-Revert-Backport-pull-request-2057.patch
Normal file
95
0004-Revert-Backport-pull-request-2057.patch
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
From 4598de7a2d925bacc4632015a92af95358b7d1b7 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Wed, 29 Jun 2022 02:40:08 -0400
|
||||
Subject: [PATCH 4/4] Revert "Backport pull request #2057"
|
||||
|
||||
This reverts commit c978fadc3e7cb166437e86fd5b52b161eb75785b.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
.appveyor.yml | 3 ++-
|
||||
.circleci/config.yml | 1 +
|
||||
.git_archival.txt | 1 +
|
||||
.github/workflows/ci-testing.yml | 3 ++-
|
||||
.github/workflows/release.yml | 3 ++-
|
||||
pyproject.toml | 3 ++-
|
||||
6 files changed, 10 insertions(+), 4 deletions(-)
|
||||
create mode 100644 .git_archival.txt
|
||||
|
||||
diff --git a/.appveyor.yml b/.appveyor.yml
|
||||
index 1d702c46..cfb916a5 100644
|
||||
--- a/.appveyor.yml
|
||||
+++ b/.appveyor.yml
|
||||
@@ -16,7 +16,8 @@ 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 shapely
|
||||
+ - set PACKAGES=%PACKAGES% requests setuptools_scm setuptools_scm_git_archive
|
||||
+ - set PACKAGES=%PACKAGES% shapely
|
||||
- conda create -n %ENV_NAME% python=%PYTHON_VERSION% %PACKAGES%
|
||||
- activate %ENV_NAME%
|
||||
- set INCLUDE=%CONDA_PREFIX%\Library\include;%INCLUDE%
|
||||
diff --git a/.circleci/config.yml b/.circleci/config.yml
|
||||
index cc9c1b31..d9807a81 100644
|
||||
--- a/.circleci/config.yml
|
||||
+++ b/.circleci/config.yml
|
||||
@@ -46,6 +46,7 @@ deps-run: &deps-install
|
||||
requests \
|
||||
scipy \
|
||||
setuptools_scm \
|
||||
+ setuptools_scm_git_archive \
|
||||
shapely \
|
||||
$EXTRA_PACKAGES \
|
||||
--file docs/doc-requirements.txt
|
||||
diff --git a/.git_archival.txt b/.git_archival.txt
|
||||
new file mode 100644
|
||||
index 00000000..95cb3eea
|
||||
--- /dev/null
|
||||
+++ b/.git_archival.txt
|
||||
@@ -0,0 +1 @@
|
||||
+ref-names: $Format:%D$
|
||||
diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
|
||||
index 5cf4593e..6ef1be70 100644
|
||||
--- a/.github/workflows/ci-testing.yml
|
||||
+++ b/.github/workflows/ci-testing.yml
|
||||
@@ -48,7 +48,8 @@ jobs:
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
PACKAGES="$PACKAGES flufl.lock owslib pep8 pillow pyshp pytest"
|
||||
- PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm shapely"
|
||||
+ PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
|
||||
+ PACKAGES="$PACKAGES setuptools_scm_git_archive 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.
|
||||
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
|
||||
index 85b52b05..fd09d902 100644
|
||||
--- a/.github/workflows/release.yml
|
||||
+++ b/.github/workflows/release.yml
|
||||
@@ -26,7 +26,8 @@ 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 shapely"
|
||||
+ PACKAGES="$PACKAGES pytest-xdist requests setuptools_scm"
|
||||
+ PACKAGES="$PACKAGES setuptools_scm_git_archive shapely"
|
||||
conda install $PACKAGES
|
||||
|
||||
- name: Create sdist
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index b905cf90..9738a040 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -4,6 +4,7 @@ requires = [
|
||||
"setuptools >= 40.6.0",
|
||||
"Cython >= 0.29.13",
|
||||
"oldest-supported-numpy",
|
||||
- "setuptools_scm >= 7.0.0",
|
||||
+ "setuptools_scm",
|
||||
+ "setuptools_scm_git_archive",
|
||||
]
|
||||
build-backend = "setuptools.build_meta"
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
%bcond_with network
|
||||
|
||||
Name: python-%{srcname}
|
||||
Version: 0.20.2
|
||||
Version: 0.20.3
|
||||
Release: %autorelease
|
||||
Summary: Cartographic Python library with Matplotlib visualisations
|
||||
|
||||
|
|
@ -20,6 +20,12 @@ Patch0001: 0001-Increase-tolerance-for-new-FreeType.patch
|
|||
# https://bugzilla.redhat.com/show_bug.cgi?id=2088864
|
||||
Patch0002: 0002-Use-pkg-config-to-find-GEOS-instead-of-geos-config.patch
|
||||
Patch0003: 0003-Remove-extraneous-insertion-of-default-compiler-path.patch
|
||||
# There is a metadata problem when mixing setuptools-scm >= 7 and
|
||||
# setuptools-scm-git-archive, which is why upstream requires >= 7. However, we
|
||||
# are not mixing versions, so we can safely downgrade.
|
||||
Patch0004: 0004-Revert-Backport-pull-request-2057.patch
|
||||
# But don't allow the new version unless dropping the above patch.
|
||||
BuildRequires: python3dist(setuptools-scm) < 7
|
||||
|
||||
BuildRequires: git-core
|
||||
BuildRequires: gcc-c++
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Cartopy-0.20.2.tar.gz) = f35f2663723a23cc7641ce447ba3744b5a99b90704ed9353f5c71ec8e882859827c7e370790faf31f75d8f3a6cab16ec5c86df5f1f8f8447427747858c398dfb
|
||||
SHA512 (Cartopy-0.20.3.tar.gz) = 87d64e8ae48c33b934ac26d05337fbbcb6936c5301d1c3e9f2ecb88fa487059727ccc62bdcd46e37f951532d9ecf781c1e465d5f5b4ead2167aa58c10d0ff1d5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue