[Git][debian-gis-team/python-shapely][master] 3 commits: Drop Python 2 support.
Bas Couwenberg
gitlab at salsa.debian.org
Sun Jul 21 20:21:20 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / python-shapely
Commits:
d8779848 by Bas Couwenberg at 2019-07-21T19:11:10Z
Drop Python 2 support.
- - - - -
bf106349 by Bas Couwenberg at 2019-07-21T19:11:38Z
Drop -doc package, FTBFS with Python 3.
- - - - -
200ef2a5 by Bas Couwenberg at 2019-07-21T19:11:39Z
Set distribution to unstable.
- - - - -
9 changed files:
- debian/changelog
- debian/control
- − debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch
- − debian/patches/0002-Retrieve-MathJax.js-locally.patch
- + debian/patches/cython3.patch
- debian/patches/series
- − debian/python-shapely-doc.doc-base
- − debian/python-shapely-doc.docs
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-python-shapely (1.6.4-3) UNRELEASED; urgency=medium
+python-shapely (1.6.4-3) unstable; urgency=medium
* Bump Standards-Version to 4.4.0, no changes.
* Drop autopkgtests to test installability & module import.
@@ -6,8 +6,10 @@ python-shapely (1.6.4-3) UNRELEASED; urgency=medium
* Update watch file to limit matches to archive path.
* Fix incomplete-creative-commons-license issue.
* Update gbp.conf to use --source-only-changes by default.
+ * Drop Python 2 support.
+ * Drop -doc package, FTBFS with Python 3.
- -- Bas Couwenberg <sebastic at debian.org> Sun, 05 Aug 2018 20:53:52 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 21 Jul 2019 20:40:05 +0200
python-shapely (1.6.4-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -7,14 +7,6 @@ Priority: optional
Build-Depends: debhelper (>= 9),
dh-python,
libgeos-dev (>= 3.3.0),
- python-all,
- python-all-dev,
- python-descartes,
- python-matplotlib,
- python-numpy,
- python-pytest,
- python-setuptools,
- python-sphinx,
python3-all,
python3-all-dev,
python3-descartes,
@@ -22,36 +14,12 @@ Build-Depends: debhelper (>= 9),
python3-numpy,
python3-pytest,
python3-setuptools,
- python3-sphinx,
- cython,
- cython3,
- libjs-mathjax
+ cython3
Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/python-shapely
Vcs-Git: https://salsa.debian.org/debian-gis-team/python-shapely.git
Homepage: http://toblerity.org/shapely
-Package: python-shapely
-Architecture: any
-Depends: python (>= 2.6) | python-ctypes,
- ${python:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Suggests: python-numpy,
- python-matplotlib,
- python-shapely-doc
-Enhances: python-numpy
-Description: geometric objects, predicates, and operations (Python 2)
- Shapely is a package for manipulation and analysis of 2D features.
- Its capabilities include:
- * calculating the point set unions, intersections, or differences of features
- * predicate tests on features: intersects, touches, contains, and more.
- .
- Supported geometric types are points, line strings, linear rings, polygons, and
- homogeneous or heterogeneous collections thereof.
- .
- This is the Python 2 version of the package.
-
Package: python3-shapely
Architecture: any
Depends: python3,
@@ -59,8 +27,7 @@ Depends: python3,
${shlibs:Depends},
${misc:Depends}
Suggests: python3-numpy,
- python3-matplotlib,
- python-shapely-doc
+ python3-matplotlib
Enhances: python3-numpy
Description: geometric objects, predicates, and operations (Python 3)
Shapely is a package for manipulation and analysis of 2D features.
@@ -72,21 +39,3 @@ Description: geometric objects, predicates, and operations (Python 3)
homogeneous or heterogeneous collections thereof.
.
This is the Python 3 version of the package.
-
-Package: python-shapely-doc
-Architecture: all
-Section: doc
-Depends: ${sphinxdoc:Depends},
- ${misc:Depends}
-Recommends: python-shapely | python3-shapely,
- libjs-mathjax
-Description: geometric objects, predicates, and operations (documentation)
- Shapely is a package for manipulation and analysis of 2D features.
- Its capabilities include:
- * calculating the point set unions, intersections, or differences of features
- * predicate tests on features: intersects, touches, contains, and more.
- .
- Supported geometric types are points, line strings, linear rings, polygons, and
- homogeneous or heterogeneous collections thereof.
- .
- This package provides the documentation for Shapely.
=====================================
debian/patches/0001-setup.cfg-to-autobuild-sphinx.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-Date: Fri, 26 Sep 2014 16:07:19 +0200
-Subject: setup.cfg to autobuild sphinx
-
----
- setup.cfg | 4 ++++
- 1 file changed, 4 insertions(+)
- create mode 100644 setup.cfg
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -2,5 +2,10 @@
- testpaths = tests
- addopts = --ignore _vendor
-
-+[build_sphinx]
-+source-dir = docs
-+build-dir = build/sphinx
-+all_files = 1
-+
- [bdist_wheel]
- universal=1
=====================================
debian/patches/0002-Retrieve-MathJax.js-locally.patch deleted
=====================================
@@ -1,19 +0,0 @@
-From: Pietro Battiston <me at pietrobattiston.it>
-Date: Tue, 30 Sep 2014 11:56:55 +0200
-Subject: Retrieve MathJax.js locally
-
----
- docs/conf.py | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -39,6 +39,8 @@ extensions = [
- 'sphinx.ext.mathjax', # <--/
- ]
-
-+mathjax_path = 'mathjax/MathJax.js?config=tex-ams-mml_htmlormml'
-+
- # Add any paths that contain templates here, relative to this directory.
- #templates_path = ['_templates']
-
=====================================
debian/patches/cython3.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Use cython3 for Python 3.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/setup.py
++++ b/setup.py
+@@ -324,7 +324,7 @@ if os.path.exists("MANIFEST.in"):
+ if (force_cython or not os.path.exists(c_file)
+ or os.path.getmtime(pyx_file) > os.path.getmtime(c_file)):
+ log.info("Updating C extension with Cython.")
+- subprocess.check_call(["cython", "shapely/speedups/_speedups.pyx"])
++ subprocess.check_call(["cython3", "shapely/speedups/_speedups.pyx"])
+ except (subprocess.CalledProcessError, OSError):
+ log.warn("Could not (re)create C extension with Cython.")
+ if force_cython:
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
-0001-setup.cfg-to-autobuild-sphinx.patch
-0002-Retrieve-MathJax.js-locally.patch
0004-Remove-externally-referenced-image.patch
+cython3.patch
=====================================
debian/python-shapely-doc.doc-base deleted
=====================================
@@ -1,8 +0,0 @@
-Document: python-shapely
-Title: Shapely Documentation
-Author: Sean Gillies, Aron Bierbaum, Kai Lautaportti and others
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-shapely-doc/html/index.html
-Files: /usr/share/doc/python-shapely-doc/html/*.html
=====================================
debian/python-shapely-doc.docs deleted
=====================================
@@ -1 +0,0 @@
-build/sphinx/html
=====================================
debian/rules
=====================================
@@ -12,13 +12,8 @@ export LC_ALL=C.UTF-8
include /usr/share/dpkg/pkg-info.mk
-BUILD_DATE := $(shell LC_ALL=C date -u "+%B %d, %Y" -d "@$(SOURCE_DATE_EPOCH)")
-
-SPHINXOPTS := -D today=\"$(BUILD_DATE)\"
-SPHINXOPTS += -D html_last_updated_fmt=\"$(BUILD_DATE)\"
-
%:
- dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild --parallel
+ dh $@ --with python3 --buildsystem=pybuild --parallel
override_dh_clean:
dh_clean VERSION.txt \
@@ -27,20 +22,6 @@ override_dh_clean:
shapely/vectorized/_vectorized.c \
Shapely.egg-info/*
-override_dh_auto_build:
- rm -f shapely/speedups/_speedups.c
- rm -f shapely/speedups/_speedups.so
- rm -f shapely/vectorized/_vectorized.c
-
- dh_auto_build
-
- python setup.py build_sphinx
- ln -s /usr/share/javascript/mathjax build/sphinx/html/_static/
-
-override_dh_python2:
- dh_python2 -ppython-shapely
- dh_numpy -ppython-shapely
-
override_dh_python3:
dh_python3 -ppython3-shapely
dh_numpy3 -ppython3-shapely
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-shapely/compare/c05f2fba48b62103fa1dc573f6b434ec90960127...200ef2a53cb6ba6c024b4cb4a3fd9f505c2088d1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/python-shapely/compare/c05f2fba48b62103fa1dc573f6b434ec90960127...200ef2a53cb6ba6c024b4cb4a3fd9f505c2088d1
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/20190721/4231f99a/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list