public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/pyshp] f44: Update to 3.0.9
@ 2026-06-04 21:23 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-06-04 21:23 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/pyshp
            Branch : f44
            Commit : c11f919b6c473cc8008bf3b6c6db28d6def33b44
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-06-04T22:13:41+01:00
            Stats  : +10/-71 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/pyshp/c/c11f919b6c473cc8008bf3b6c6db28d6def33b44?branch=f44

            Log:
            Update to 3.0.9

- Avoid the need to include large test files and serve them locally

---
diff --git a/.gitignore b/.gitignore
index 8904a8d..3076b35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /pyshp-3.0.6.tar.gz
 /pyshp-3.0.7.tar.gz
 /pyshp-3.0.8.tar.gz
+/pyshp-3.0.9.tar.gz

diff --git a/pyshp.spec b/pyshp.spec
index 952cda9..423a270 100644
--- a/pyshp.spec
+++ b/pyshp.spec
@@ -1,51 +1,15 @@
 Name:           pyshp
-Version:        3.0.8
+Version:        3.0.9
 Release:        %autorelease
 Summary:        Pure Python read/write support for ESRI Shapefile format
 
-# The entire source is MIT, except:
-#
-# - Test data in Source10-Source25 is either LicenseRef-Fedora-Public-Domain or
-#   ODbl-1.0; see comments near individual Source fields for details.
-# - shapefiles/test/REL.zip is CC-BY-4.0
-#
-# These do not affect the licenses of binary RPMs because they are used only as
-# test data.
+# The entire source is MIT, except that shapefiles/test/REL.zip is CC-BY-4.0;
+# this does not affect the licenses of binary RPMs because this file is used
+# only as test data.
 License:        MIT
-SourceLicense:  %{shrink:
-    %{license} AND
-    CC-BY-4.0 AND
-    LicenseRef-Fedora-Public-Domain AND
-    ODbl-1.0
-    }
+SourceLicense:  %{license} AND CC-BY-4.0
 URL:            https://github.com/GeospatialPython/pyshp
-Source0:        %{url}/archive/%{version}/pyshp-%{version}.tar.gz
-
-# Shapefiles for doctests. These are not packaged in the binary RPMs, so do not
-# contribute to the License. They are LicenseRef-Fedora-Public-Domain
-# (https://github.com/nvkelso/natural-earth-vector/blob/master/LICENSE.md; see
-# also http://www.naturalearthdata.com/about/terms-of-use/). Upstream tests
-# fetch these from the network.
-%global ne_url https://github.com/nvkelso/natural-earth-vector
-# Upstream uses “master”
-%global ne_commit ca96624a56bd078437bca8184e78163e5039ad19
-Source10:       %{ne_url}/raw/%{ne_commit}/10m_cultural/ne_10m_admin_1_states_provinces.cpg
-Source11:       %{ne_url}/raw/%{ne_commit}/10m_cultural/ne_10m_admin_1_states_provinces.dbf
-Source12:       %{ne_url}/raw/%{ne_commit}/10m_cultural/ne_10m_admin_1_states_provinces.prj
-Source13:       %{ne_url}/raw/%{ne_commit}/10m_cultural/ne_10m_admin_1_states_provinces.shp
-Source14:       %{ne_url}/raw/%{ne_commit}/10m_cultural/ne_10m_admin_1_states_provinces.shx
-Source20:       %{ne_url}/raw/%{ne_commit}/110m_cultural/ne_110m_admin_0_tiny_countries.cpg
-Source21:       %{ne_url}/raw/%{ne_commit}/110m_cultural/ne_110m_admin_0_tiny_countries.dbf
-Source22:       %{ne_url}/raw/%{ne_commit}/110m_cultural/ne_110m_admin_0_tiny_countries.prj
-Source23:       %{ne_url}/raw/%{ne_commit}/110m_cultural/ne_110m_admin_0_tiny_countries.shp
-Source24:       %{ne_url}/raw/%{ne_commit}/110m_cultural/ne_110m_admin_0_tiny_countries.shx
-# This is an OpenStreetMap extract originally obtained from
-# https://download.geofabrik.de/, so it is ODbl-1.0; see
-# https://www.openstreetmap.org/copyright/.
-%global data_url https://github.com/JamesParrott/PyShp_test_shapefile
-# Upstream uses “main”
-%global data_commit 2583dba70d0892fc787e1a837df07c3ea8e69950
-Source25:       %{data_url}/raw/%{data_commit}/gis_osm_natural_a_free_1.zip
+Source:         %{url}/archive/%{version}/pyshp-%{version}.tar.gz
 
 BuildSystem:    pyproject
 BuildOption(install): --assert-license shapefile
@@ -83,25 +47,10 @@ Summary:        %{summary}
 %description -n python3-pyshp %{common_description}
 
 
-%prep -a
-mkdir --parents _testdata
-ln '%{SOURCE10}' '%{SOURCE11}' '%{SOURCE12}' '%{SOURCE13}' '%{SOURCE14}' \
-    '%{SOURCE20}' '%{SOURCE21}' '%{SOURCE22}' '%{SOURCE23}' '%{SOURCE24}' \
-    '%{SOURCE25}' _testdata/
-
-
 %check -a
-# Serve the test data locally; see the “Network tests” section in README.md
-pushd _testdata
-%{python3} -m http.server 8000 &
-SERVER_PID="$!"
-trap "kill '${SERVER_PID}'" INT TERM EXIT
-popd
-export REPLACE_REMOTE_URLS_WITH_LOCALHOST='yes'
-
-%pytest --verbose
+%pytest -m 'not network' --verbose
 # Doctests
-%{py3_test_envvars} %{python3} test_shapefile.py
+%{py3_test_envvars} %{python3} test_shapefile.py -m 'not network'
 
 
 %files -n python3-pyshp -f %{pyproject_files}

diff --git a/sources b/sources
index e29b307..18ce2a4 100644
--- a/sources
+++ b/sources
@@ -1,12 +1 @@
-SHA512 (pyshp-3.0.8.tar.gz) = 45d69037ae752911b7d012d6d2ca0093ecec1aa368f1d161be6b3ad4743af1b5c06d6de0239ca3cc7042aa2a41f739865195197cd712238be51b7891b642e12b
-SHA512 (ne_10m_admin_1_states_provinces.cpg) = ce7ba9a82c602e57507185e7a749f9eb76bce2b0fb87e478e815ab868600be13199fbea902b996458e20ef3cf2d61219e5d1743a1d8a2deddc76bc90d1802ddf
-SHA512 (ne_10m_admin_1_states_provinces.dbf) = 74706df2dfb77764ab2b3200435b4ca4fa592e9683f7ee55f890dcf5cc9a3bcce6306c4233e397d21db1f86eae23abee23e90df3dd0b9bb40bf1f1cb0ebcbb41
-SHA512 (ne_10m_admin_1_states_provinces.prj) = b3ddd6fbfb5cca02d69acf67f986a7d1bd0400d72db141b610a141c4b70fc18f9969cb6935b66c466902510f6565d221d183f13203be4362817f97f5794edf75
-SHA512 (ne_10m_admin_1_states_provinces.shp) = ac4c166374a90be5bc76741201d74f7fd0c0a737ab7374fa7a7da52a7f17c2416d032adcef52b1f2445456c6ea35033ffd3b7e913bfe8e26aa738a8b51308ded
-SHA512 (ne_10m_admin_1_states_provinces.shx) = 87d351d7601ee5ba9a99e653ec5c49f5a8422f88037544da9982d61df04344db6d6801fbae53da2464179edd6c96b3fff8b838dc1d854997da3fec595fbc8a61
-SHA512 (ne_110m_admin_0_tiny_countries.cpg) = ce7ba9a82c602e57507185e7a749f9eb76bce2b0fb87e478e815ab868600be13199fbea902b996458e20ef3cf2d61219e5d1743a1d8a2deddc76bc90d1802ddf
-SHA512 (ne_110m_admin_0_tiny_countries.dbf) = 1c4fcff2c9cf86508e1f4964d19bddbeb7ff2fe12024a7cdeb9e16f6f6bc38546fed927a00826443cf9260c7f3dbd83f5b2d2e36c5a951465c54cd9c0f843296
-SHA512 (ne_110m_admin_0_tiny_countries.prj) = b3ddd6fbfb5cca02d69acf67f986a7d1bd0400d72db141b610a141c4b70fc18f9969cb6935b66c466902510f6565d221d183f13203be4362817f97f5794edf75
-SHA512 (ne_110m_admin_0_tiny_countries.shp) = 3b6d07ded70a9b6ecdad6f6fa002106b41a7a0958b34d6e6904ded6a7f88f3ce177b53d9ae0a0bc23eff4837d174950f38546361f52e6665072ccb862e243c10
-SHA512 (ne_110m_admin_0_tiny_countries.shx) = 42c319c7f2c8628088fb1586c051c0ab6f43b71633e85f78cd4bbe08c8765b80f05f6353bf471eabff8c6cf526eb76418603e05e26fb668c298faa0859584102
-SHA512 (gis_osm_natural_a_free_1.zip) = 49f9625835e86fb5e424b774d234f36a6f449ffb8262b0e1ae711594a5aa67f4930e34a7e7735d04f1bb8fbd64a581a455b5fc172f4705e37cf3f8935d2fd2a5
+SHA512 (pyshp-3.0.9.tar.gz) = e226b7d8840cbedd6eadf89cae9b79dac80fdca761eaa884212f4b45e0f257f9f28de7ce636c5d9d39102b2635fb686acc60bb9f86844477fe9f723442c10c3f

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-04 21:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-04 21:23 [rpms/pyshp] f44: Update to 3.0.9 Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox