Control: tags 936480 + patch
Dear maintainer,
I've prepared an NMU for empy (versioned as 3.3.2-5.1). The diff
is attached to this message.
Regards.
diff -Nru empy-3.3.2/debian/changelog empy-3.3.2/debian/changelog
--- empy-3.3.2/debian/changelog 2020-02-17 14:56:03.000000000 -0500
+++ empy-3.3.2/debian/changelog 2020-03-16 01:02:47.000000000 -0400
@@ -1,3 +1,10 @@
+empy (3.3.2-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop python2 support; Closes: #936480
+
+ -- Sandro Tosi <mo...@debian.org> Mon, 16 Mar 2020 01:02:47 -0400
+
empy (3.3.2-5) unstable; urgency=medium
* Use dh-exec to install empy for python3
diff -Nru empy-3.3.2/debian/control empy-3.3.2/debian/control
--- empy-3.3.2/debian/control 2020-02-17 14:55:49.000000000 -0500
+++ empy-3.3.2/debian/control 2020-03-16 01:01:24.000000000 -0400
@@ -6,40 +6,13 @@
Build-Depends: debhelper (>= 12),
dh-python,
dh-exec,
- python-all,
python3-all,
- python-setuptools,
python3-setuptools,
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/jrivero-guest/empy
Vcs-Git: https://salsa.debian.org/science-team/jrivero-guest/empy.git
Homepage: http://www.alcyone.com/software/empy/
-Package: python-empy
-Architecture: all
-Multi-Arch: foreign
-Depends: ${python:Depends}, ${misc:Depends}
-Breaks: python3-empy (<= 3.3-8)
-Description: templating system for Python (Python 2)
- EmPy is a system for embedding Python expressions and statements
- in template text; it takes an EmPy source file, processes it, and
- produces output.
- This is accomplished via expansions, which are special signals
- to the EmPy system and are set off by a special prefix (by default
- the at sign, '@'). EmPy can expand arbitrary Python expressions
- and statements in this way, as well as a variety of special forms.
- Textual data not explicitly delimited in this way is sent unaffected
- to the output, allowing Python to be used in effect as a markup
- language.
- Also supported are "hook" callbacks, recording and playback via
- diversions, and dynamic, chainable filters.
- The system is highly configurable via command line options and
- embedded commands.
- .
- This is the Python 2 version of the package. This version installs
- the empy executable under the name "empy"
- .
-
Package: python3-empy
Architecture: all
Multi-Arch: foreign
diff -Nru empy-3.3.2/debian/python-empy.dirs empy-3.3.2/debian/python-empy.dirs
--- empy-3.3.2/debian/python-empy.dirs 2019-07-11 15:52:41.000000000 -0400
+++ empy-3.3.2/debian/python-empy.dirs 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-usr/bin/
diff -Nru empy-3.3.2/debian/python-empy.examples empy-3.3.2/debian/python-empy.examples
--- empy-3.3.2/debian/python-empy.examples 2019-07-11 15:52:41.000000000 -0400
+++ empy-3.3.2/debian/python-empy.examples 1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-sample.bench
-sample.em
diff -Nru empy-3.3.2/debian/python-empy.manpages empy-3.3.2/debian/python-empy.manpages
--- empy-3.3.2/debian/python-empy.manpages 2019-07-11 15:52:41.000000000 -0400
+++ empy-3.3.2/debian/python-empy.manpages 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-debian/empy.1
diff -Nru empy-3.3.2/debian/rules empy-3.3.2/debian/rules
--- empy-3.3.2/debian/rules 2020-02-17 14:55:49.000000000 -0500
+++ empy-3.3.2/debian/rules 2020-03-16 01:01:48.000000000 -0400
@@ -5,17 +5,12 @@
export PYBUILD_NAME=empy
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- ./test.sh python
./test.sh python3
endif
-override_dh_auto_install:
- dh_auto_install
- install -m 755 $(CURDIR)/debian/python-empy/usr/lib/python2.*/dist-packages/em.py $(CURDIR)/debian/python-empy/usr/bin/empy
-
override_dh_python3:
dh_python3 --shebang='/usr/bin/env python3'
diff -Nru empy-3.3.2/debian/tests/build empy-3.3.2/debian/tests/build
--- empy-3.3.2/debian/tests/build 2019-07-11 15:52:41.000000000 -0400
+++ empy-3.3.2/debian/tests/build 2020-03-16 01:02:44.000000000 -0400
@@ -142,12 +142,6 @@
You can expand multiple times: @:2 + 2:4:
EOF2
-if empy sample.em | diff sample.bench -; then
- echo "python2 empy call ok"
-else
- exit 1
-fi
-
if empy3 sample.em | diff sample.bench -; then
echo "python3 empy3 call ok"
else
