Control: block -1 by 866569
The attached should be enough to fix this in a 2.0.0-2 upload but building
translate-toolkit for all available python3 interpreters is blocked by
python3-lxml's lack of python3.6 support.
--
Stuart Prescott http://www.nanonanonano.net/ stu...@nanonanonano.net
Debian Developer http://www.debian.org/ stu...@debian.org
GPG fingerprint 90E2 D2C1 AD14 6A1B 7EBB 891D BBC1 7EBB 1396 F2F7
>From 4651a3c4050527d008a5d6a565deabea954ef2d1 Mon Sep 17 00:00:00 2001
From: Stuart Prescott <stu...@debian.org>
Date: Sat, 1 Jul 2017 23:30:37 +1000
Subject: [PATCH 1/2] Leave PYTHONPATH alone during testing
(Closes: #866551)
---
debian/patches/series | 1 +
debian/patches/xliff-sys-path.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 debian/patches/xliff-sys-path.patch
diff --git a/debian/patches/series b/debian/patches/series
index e4c5ca6..2d716bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ sphinx-intersphinx.patch
#langmodels-relocate.patch
af-pootle.patch
py3-skip-tests.patch
+xliff-sys-path.patch
diff --git a/debian/patches/xliff-sys-path.patch b/debian/patches/xliff-sys-path.patch
new file mode 100644
index 0000000..bc3d7ec
--- /dev/null
+++ b/debian/patches/xliff-sys-path.patch
@@ -0,0 +1,37 @@
+From 1bc706a37a1c24ad2f45c77cc8ac7e8702939144 Mon Sep 17 00:00:00 2001
+From: Leandro Regueiro <leandro.regue...@gmail.com>
+Date: Fri, 30 Jun 2017 15:37:15 +0200
+Subject: [PATCH] Remove manual setting of PATH
+
+Instead rely on existing PATH. Previous code fails if there are
+multiple Python versions at the same time because all the existing
+PATH is being put together. Also it is not necessary anymore since
+now virtualenvs are used.
+
+Fixes #3659.
+---
+ tests/xliff_conformance/test_xliff_conformance.py | 13 -------------
+ 1 file changed, 13 deletions(-)
+
+--- a/tests/xliff_conformance/test_xliff_conformance.py
++++ b/tests/xliff_conformance/test_xliff_conformance.py
+@@ -26,19 +26,6 @@
+
+ import pytest
+
+-# get directory of this test
+-dir = os.path.dirname(os.path.abspath(__file__))
+-# get top-level directory (moral equivalent of ../..)
+-dir = os.path.dirname(os.path.dirname(dir))
+-# load python modules from top-level
+-sys.path.insert(0, dir)
+-# add top-level to PYTHONPATH for subprocesses
+-os.environ["PYTHONPATH"] = os.pathsep.join(sys.path)
+-# add {top-level}/translate/convert to PATH for [po]o2xliff
+-os.environ["PATH"] = os.pathsep.join([os.path.join(dir,
+- "translate", "convert"),
+- os.environ["PATH"]])
+-
+ schema = None
+
+
--
2.11.0
