[Python-modules-commits] [tox] 03/04: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Jul 13 23:31:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository tox.
commit 2c0f99cc01b13178979bf576671a85aac6f7e6f9
Merge: b2ad0c3 a1a0745
Author: Barry Warsaw <barry at python.org>
Date: Mon Jul 13 19:03:29 2015 -0400
merge patched into master
debian/.git-dpm | 4 ++--
debian/patches/build-time-test-adjustments.patch | 11 ++++++-----
debian/patches/de-google-ify.patch | 2 +-
tox.ini | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)
diff --cc debian/.git-dpm
index aee8a6d,0000000..9f0aae7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- 5921da6ee538a49671bc6c6c7fe24aa2aa43fa8f
- 5921da6ee538a49671bc6c6c7fe24aa2aa43fa8f
++a1a074545124a83564dde0ebacf66b81b5e6dacb
++a1a074545124a83564dde0ebacf66b81b5e6dacb
+6e320b49d2b82f58d78631a1881c4f13f0a3e72e
+6e320b49d2b82f58d78631a1881c4f13f0a3e72e
+tox_2.1.1.orig.tar.gz
+32be3ba78431f83e3542e0a4dfbea6ad349af2db
+102170
diff --cc debian/patches/build-time-test-adjustments.patch
index 06af098,0000000..b6798c6
mode 100644,000000..100644
--- a/debian/patches/build-time-test-adjustments.patch
+++ b/debian/patches/build-time-test-adjustments.patch
@@@ -1,78 -1,0 +1,79 @@@
- From 390037a84b5f3bc3a5708f57ac5c8a9dbcf815a4 Mon Sep 17 00:00:00 2001
++From df9aeea21a177f2e4f1c3c73d1d7a6e750d4e7c9 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Sat, 21 Jun 2014 18:44:45 -0400
+Subject: Skip some tests at build time, fix others.
+
+ Some of tox's unit tests require tox to be already built and installed. This
+ is a catch 22, and such tests can't pass at package build time. These are
+ disabled by adding a decorator that skips the test when an environment
+ variable is set. debian/rules sets this envar. The DEP-8 tests do not set
+ this envar and therefore run the full test suite.
+
+ A few other tests just need some tweaks during package build, e.g. to use the
+ system packages rather than trying to download them from PyPI.
+
+ This also tweaks the tox.ini to use Debian's Python 3 py.test executable.
+
+Patch-Name: build-time-test-adjustments.patch
+---
+ tests/test_z_cmdline.py | 7 +++++--
- tox.ini | 2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
++ tox.ini | 3 ++-
++ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test_z_cmdline.py b/tests/test_z_cmdline.py
+index b288880..cc6deb7 100644
+--- a/tests/test_z_cmdline.py
++++ b/tests/test_z_cmdline.py
+@@ -1,3 +1,4 @@
++import os
+ import tox
+ import py
+ import pytest
+@@ -431,7 +432,7 @@ class TestToxRun:
+ changedir=tests
+ commands= py.test --basetemp={envtmpdir} \
+ --junitxml=junit-{envname}.xml
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+
+@@ -478,6 +479,7 @@ class TestToxRun:
+ ])
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_develop(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ """})
+@@ -529,7 +531,7 @@ def test_test_usedevelop(cmd, initproj):
+ changedir=tests
+ commands=
+ py.test --basetemp={envtmpdir} --junitxml=junit-{envname}.xml []
+- deps=pytest
++ sitepackages=True
+ '''
+ })
+ result = cmd.run("tox", "-v")
+@@ -569,6 +571,7 @@ def test_test_usedevelop(cmd, initproj):
+ ])
+
+
++ at pytest.mark.skipif(os.environ.get('DEB_SKIP_TOX_TESTS'), reason='Use DEP-8')
+ def test_test_piphelp(initproj, cmd):
+ initproj("example123", filedefs={'tox.ini': """
+ # content of: tox.ini
+diff --git a/tox.ini b/tox.ini
- index d78bcbd..eb4980b 100644
++index d78bcbd..3658fff 100644
+--- a/tox.ini
++++ b/tox.ini
- @@ -5,7 +5,7 @@ envlist=py27,py26,py34,py33,pypy,flakes,py26-bare
++@@ -5,7 +5,8 @@ envlist=py27,py26,py34,py33,pypy,flakes,py26-bare
+ commands=echo {posargs}
+
+ [testenv]
+-commands= py.test --timeout=180 {posargs}
++commands= py.test-3 --timeout=180 {posargs}
+++whitelist_externals: py.test-3
+
+ deps=pytest>=2.3.5
+ pytest-timeout
diff --cc debian/patches/de-google-ify.patch
index 5a1aeb6,0000000..eaf6ecf
mode 100644,000000..100644
--- a/debian/patches/de-google-ify.patch
+++ b/debian/patches/de-google-ify.patch
@@@ -1,28 -1,0 +1,28 @@@
- From 5921da6ee538a49671bc6c6c7fe24aa2aa43fa8f Mon Sep 17 00:00:00 2001
++From a1a074545124a83564dde0ebacf66b81b5e6dacb Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Sat, 21 Jun 2014 18:44:45 -0400
+Subject: de-google-ify
+
+Patch-Name: de-google-ify.patch
+---
+ doc/_templates/layout.html | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
+index 1892483..66e6fdd 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -3,13 +3,4 @@
+
+ {% block footer %}
+ {{ super() }}
+-<script type="text/javascript">
+-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+-</script>
+-<script type="text/javascript">
+-try {
+-var pageTracker = _gat._getTracker("UA-17241637-3");
+-pageTracker._trackPageview();
+-} catch(err) {}</script>
+ {% endblock %}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/tox.git
More information about the Python-modules-commits
mailing list