[Git][debian-gis-team/python-shapely][experimental] 5 commits: Add patch to fix _version.py.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / python-shapely


Commits:
0787cf60 by Bas Couwenberg at 2022-12-06T09:42:36+01:00
Add patch to fix _version.py.

- - - - -
e83f8e37 by Bas Couwenberg at 2022-12-06T10:33:32+01:00
Revert "Add patch to fix _version.py."

This reverts commit 0787cf60d3917fa1a42d90a04662fe1431e3df2d.

- - - - -
3369fda3 by Bas Couwenberg at 2022-12-06T10:36:43+01:00
Add patch to fix versioneer configuration.

- - - - -
36463542 by Bas Couwenberg at 2022-12-06T10:38:42+01:00
Drop obsolete dh_clean override.

- - - - -
d3015fa2 by Bas Couwenberg at 2022-12-06T10:38:42+01:00
Set distribution to experimental.

- - - - -


4 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/versioneer.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+python-shapely (2.0~rc2-1~exp2) experimental; urgency=medium
+
+  * Add patch to fix versioneer configuration.
+  * Drop obsolete dh_clean override.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Dec 2022 10:36:54 +0100
+
 python-shapely (2.0~rc2-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0004-Remove-externally-referenced-image.patch
+versioneer.patch


=====================================
debian/patches/versioneer.patch
=====================================
@@ -0,0 +1,46 @@
+Description: Fix versioneer configuration.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/shapely/shapely/issues/1653
+Forwarded: https://github.com/shapely/shapely/pull/1654
+
+--- a/.gitattributes
++++ b/.gitattributes
+@@ -1 +1 @@
+-pygeos/_version.py export-subst
++shapely/_version.py export-subst
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -4,6 +4,7 @@ style = pep440
+ versionfile_source = shapely/_version.py
+ versionfile_build = shapely/_version.py
+ tag_prefix =
++parentdir_prefix = shapely-
+ 
+ [flake8]
+ max-line-length = 88
+--- a/shapely/_version.py
++++ b/shapely/_version.py
+@@ -22,9 +22,9 @@ def get_keywords():
+     # setup.py/versioneer.py will grep for the variable names, so they must
+     # each be defined on a line of their own. _version.py will just call
+     # get_keywords().
+-    git_refnames = "$Format:%d$"
+-    git_full = "$Format:%H$"
+-    git_date = "$Format:%ci$"
++    git_refnames = " (HEAD -> main, tag: 2.0rc2)"
++    git_full = "3bd981c0055d0a56e01bd3db4bec8a0d591a6284"
++    git_date = "2022-12-03 15:38:04 +0100"
+     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
+     return keywords
+ 
+@@ -41,8 +41,8 @@ def get_config():
+     cfg.VCS = "git"
+     cfg.style = "pep440"
+     cfg.tag_prefix = ""
+-    cfg.parentdir_prefix = "None"
+-    cfg.versionfile_source = "pygeos/_version.py"
++    cfg.parentdir_prefix = "shapely-"
++    cfg.versionfile_source = "shapely/_version.py"
+     cfg.verbose = False
+     return cfg
+ 


=====================================
debian/rules
=====================================
@@ -11,18 +11,10 @@ export PYBUILD_NAME=shapely
 export LC_ALL=C.UTF-8
 
 include /usr/share/dpkg/architecture.mk
-include /usr/share/dpkg/pkg-info.mk
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_clean:
-	dh_clean VERSION.txt \
-	         shapely/speedups/_speedups.c \
-	         shapely/speedups/_speedups.so \
-	         shapely/vectorized/_vectorized.c \
-	         Shapely.egg-info/*
-
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifneq (,$(filter $(DEB_BUILD_ARCH),mips64el mipsel s390x hppa ppc64))



View it on GitLab: https://salsa.debian.org/debian-gis-team/python-shapely/-/compare/9f1dc33fd2921a3bf2532794381328d5a4807904...d3015fa2c02c7016e8666fe412b18d14c3c97653

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-shapely/-/compare/9f1dc33fd2921a3bf2532794381328d5a4807904...d3015fa2c02c7016e8666fe412b18d14c3c97653
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20221206/48adb52c/attachment-0001.htm>