[Debian-l10n-commits] translate-toolkit branch master updated. debian/2.0.0-2
Stuart Prescott
stuart at moszumanska.debian.org
Sun Jul 30 00:11:53 UTC 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "translate-toolkit".
The branch, master has been updated
via f08691e6496145c1399772df3124c2286e887d5d (commit)
via 78986eec4216dbbf182665251a688aaa7e9da065 (commit)
via b2443198caaf1bbeb9cc95e07d77212c639eb3d7 (commit)
via 4651a3c4050527d008a5d6a565deabea954ef2d1 (commit)
via 57469ca35d3693edfe4f8bdb8943823d15a0a964 (commit)
from 3daec1b2e8153aa38a301357c3cd8d5ba4785b98 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=f08691e6496145c1399772df3124c2286e887d5d
commit f08691e6496145c1399772df3124c2286e887d5d
Author: Stuart Prescott <stuart at debian.org>
Date: Sat Jul 1 23:34:57 2017 +1000
Add changelog for upload
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=78986eec4216dbbf182665251a688aaa7e9da065
commit 78986eec4216dbbf182665251a688aaa7e9da065
Author: Stuart Prescott <stuart at debian.org>
Date: Sun Jul 30 00:58:03 2017 +1000
Bump standards version to 4.0.0
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=b2443198caaf1bbeb9cc95e07d77212c639eb3d7
commit b2443198caaf1bbeb9cc95e07d77212c639eb3d7
Author: Stuart Prescott <stuart at debian.org>
Date: Sun Jul 30 00:57:22 2017 +1000
Remove more manipulation of sys.path
(Closes: #866551).
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=4651a3c4050527d008a5d6a565deabea954ef2d1
commit 4651a3c4050527d008a5d6a565deabea954ef2d1
Author: Stuart Prescott <stuart at debian.org>
Date: Sat Jul 1 23:30:37 2017 +1000
Leave PYTHONPATH alone during testing
(Closes: #866551)
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=57469ca35d3693edfe4f8bdb8943823d15a0a964
commit 57469ca35d3693edfe4f8bdb8943823d15a0a964
Author: Stuart Prescott <stuart at debian.org>
Date: Sat Jul 1 23:29:44 2017 +1000
Refresh patches
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 +++++++
debian/control | 2 +-
debian/patches/disable-sphinx-theme.patch | 2 +-
debian/patches/mo-sys-path.patch | 28 +++++++++++++++++++++++
debian/patches/series | 2 ++
debian/patches/tests-skip-call.patch | 2 +-
debian/patches/xliff-sys-path.patch | 37 +++++++++++++++++++++++++++++++
7 files changed, 78 insertions(+), 3 deletions(-)
create mode 100644 debian/patches/mo-sys-path.patch
create mode 100644 debian/patches/xliff-sys-path.patch
diff --git a/debian/changelog b/debian/changelog
index e9e9f98..15e4f5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+translate-toolkit (2.0.0-2) unstable; urgency=medium
+
+ * Stop altering PYTHONPATH in test suite to prevent failures when more than
+ one Python 3 is available (Closes: #866551).
+ * Update Standards-Version to 4.0.0 (no changes required).
+
+ -- Stuart Prescott <stuart at debian.org> Sun, 30 Jul 2017 00:59:40 +1000
+
translate-toolkit (2.0.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 1700b09..65f741e 100644
--- a/debian/control
+++ b/debian/control
@@ -51,7 +51,7 @@ Build-Depends-Indep:
Build-Depends:
debhelper (>= 9~),
dh-python,
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
Vcs-Git: https://anonscm.debian.org/cgit/debian-l10n/translate-toolkit.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-l10n/translate-toolkit.git
Homepage: http://toolkit.translatehouse.org/
diff --git a/debian/patches/disable-sphinx-theme.patch b/debian/patches/disable-sphinx-theme.patch
index 7a2904d..29f187e 100644
--- a/debian/patches/disable-sphinx-theme.patch
+++ b/debian/patches/disable-sphinx-theme.patch
@@ -3,7 +3,7 @@ Author: Stuart Prescott <stuart at debian.org>
Forwarded: http://bugs.locamotion.org/show_bug.cgi?id=2796
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -158,17 +158,17 @@
+@@ -161,17 +161,17 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
diff --git a/debian/patches/mo-sys-path.patch b/debian/patches/mo-sys-path.patch
new file mode 100644
index 0000000..5651c8f
--- /dev/null
+++ b/debian/patches/mo-sys-path.patch
@@ -0,0 +1,28 @@
+Description: Remove manipulation of sys.path from test_mo.py
+Author: Stuart Prescott <stuart at debian.org>
+
+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.
+
+--- a/translate/storage/test_mo.py
++++ b/translate/storage/test_mo.py
+@@ -7,18 +7,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/tools to PATH for pocompile
+-os.environ["PATH"] = os.pathsep.join([os.path.join(dir, "translate", "tools"),
+- os.environ["PATH"]])
+-
+
+ class TestMOUnit(test_base.TestTranslationUnit):
+ UnitClass = mo.mounit
diff --git a/debian/patches/series b/debian/patches/series
index e4c5ca6..b4daed9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,5 @@ sphinx-intersphinx.patch
#langmodels-relocate.patch
af-pootle.patch
py3-skip-tests.patch
+xliff-sys-path.patch
+mo-sys-path.patch
diff --git a/debian/patches/tests-skip-call.patch b/debian/patches/tests-skip-call.patch
index 25680d8..1944927 100644
--- a/debian/patches/tests-skip-call.patch
+++ b/debian/patches/tests-skip-call.patch
@@ -42,7 +42,7 @@ Author: Stuart Prescott <stuart at debian.org>
# get directory of this test
dir = os.path.dirname(os.path.abspath(__file__))
-@@ -136,6 +137,8 @@
+@@ -137,6 +138,8 @@
store.updateheader(add=True, Language="zu")
assert store.gettargetlanguage() == "zu"
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.regueiro at 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
+
+
-----------------------------------------------------------------------
hooks/post-receive
--
translate-toolkit
More information about the Debian-l10n-commits
mailing list