[med-svn] [mypy] 01/01: fix for python 3 versions

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to tag debian/0.511-2
in repository mypy.

commit dd0dcc1d446a2d702be0bbfef4b4662c1147718e
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Tue Jul 11 01:11:05 2017 -0700

    fix for python 3 versions
---
 debian/changelog                   | 15 +++++++++++++++
 debian/patches/adjust-test-py-path | 10 ++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  7 ++++---
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f5795f..660e413 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mypy (0.511-2) unstable; urgency=high
+
+  * Merge fix from Ubuntu / Michael Hudson-Doyle to prevent ftbfs when multiple
+    python 3 versions are supported. (Closes: #865946)
+  * Patch one of upstream's tests to use python3 explicitly
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Tue, 11 Jul 2017 01:08:22 -0700
+
+mypy (0.511-1ubuntu1) artful; urgency=medium
+
+  * d/rules: fix manpage build when multiple versions of Python 3 are
+    supported.
+
+ -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Mon, 26 Jun 2017 12:02:52 +1200
+
 mypy (0.511-1) unstable; urgency=medium
 
   * Run the upstream tests
diff --git a/debian/patches/adjust-test-py-path b/debian/patches/adjust-test-py-path
new file mode 100644
index 0000000..79c11c6
--- /dev/null
+++ b/debian/patches/adjust-test-py-path
@@ -0,0 +1,10 @@
+From: Michael R. Crusoe <michael.crusoe at gmail.com>
+Subject: specify python3 for typeshed test
+--- mypy.orig/typeshed/tests/pytype_test.py
++++ mypy/typeshed/tests/pytype_test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ """Test runner for typeshed.
+ 
+ Depends on mypy and pytype being installed.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..341f822
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+adjust-test-py-path
diff --git a/debian/rules b/debian/rules
index 043ac13..f44cb3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,18 @@
 # DH_VERBOSE := 1
 export PYBUILD_NAME = mypy
 export PYBUILD_DISABLE=test
-PPATH=$(CURDIR):$(CURDIR)/lib-typing/3.2
+PPATH=$(CURDIR)
+PY3V=$(shell py3versions -dv)
 include /usr/share/dpkg/pkg-info.mk
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_build:
 	dh_auto_build
-	PYTHONPATH=$(PPATH) help2man build/*/mypy --no-info \
+	PYTHONPATH=$(PPATH) help2man build/scripts-$(PY3V)/mypy --no-info \
 		   --version-string="${DEB_VERSION_UPSTREAM}" \
 		   --name 'Optional Static Typing for Python' > debian/mypy.1
-	PYTHONPATH=$(PPATH) help2man build/*/stubgen --no-info \
+	PYTHONPATH=$(PPATH) help2man build/scripts-$(PY3V)/stubgen --no-info \
 		   --no-discard-stderr --version-string="${DEB_VERSION_UPSTREAM}" \
 		   --name 'Generate draft stubs for Python modules.' > \
 		   debian/stubgen.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mypy.git