[Python-apps-commits] r9983 - in packages/tox/trunk/debian (7 files)

[barry at users.alioth.debian.org]

    Date: Tuesday, August 20, 2013 @ 16:09:26
  Author: barry
Revision: 9983

* new upstream release.
  - d/patches/upstream-issue58.patch: Removed; applied upstream.
  - d/patches/no-download.patch: Refreshed.
  - d/patches/pytest-dep-version.patch: Removed; no longer necessary.
  - d/patches/testenv-deps.patch: Added

Added:
  packages/tox/trunk/debian/patches/testenv-deps.patch
Modified:
  packages/tox/trunk/debian/changelog
  packages/tox/trunk/debian/patches/no-download.patch
  packages/tox/trunk/debian/patches/series
Deleted:
  packages/tox/trunk/debian/patches/fix-doctree.patch
  packages/tox/trunk/debian/patches/pytest-dep-version.patch
  packages/tox/trunk/debian/patches/upstream-issue58.patch

Modified: packages/tox/trunk/debian/changelog
===================================================================
--- packages/tox/trunk/debian/changelog	2013-08-18 23:54:40 UTC (rev 9982)
+++ packages/tox/trunk/debian/changelog	2013-08-20 16:09:26 UTC (rev 9983)
@@ -1,3 +1,13 @@
+tox (1.6.0-1) UNRELEASED; urgency=low
+
+  * new upstream release.
+    - d/patches/upstream-issue58.patch: Removed; applied upstream.
+    - d/patches/no-download.patch: Refreshed.
+    - d/patches/pytest-dep-version.patch: Removed; no longer necessary.
+    - d/patches/testenv-deps.patch: Added
+
+ -- Barry Warsaw <barry at debian.org>  Mon, 19 Aug 2013 15:42:14 -0400
+
 tox (1.5.0-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Deleted: packages/tox/trunk/debian/patches/fix-doctree.patch
===================================================================
--- packages/tox/trunk/debian/patches/fix-doctree.patch	2013-08-18 23:54:40 UTC (rev 9982)
+++ packages/tox/trunk/debian/patches/fix-doctree.patch	2013-08-20 16:09:26 UTC (rev 9983)
@@ -1,13 +0,0 @@
-Description: There is no config-v1 document.
-Author: Barry Warsaw <barry at python.org>
-Bug: https://bitbucket.org/hpk42/tox/issue/57/doc-indextxt-refers-to-non-existent
---- a/doc/index.txt
-+++ b/doc/index.txt
-@@ -93,7 +93,6 @@
-    install
-    examples
-    config
--   config-v1
-    support
-    changelog
-    links

Modified: packages/tox/trunk/debian/patches/no-download.patch
===================================================================
--- packages/tox/trunk/debian/patches/no-download.patch	2013-08-18 23:54:40 UTC (rev 9982)
+++ packages/tox/trunk/debian/patches/no-download.patch	2013-08-20 16:09:26 UTC (rev 9983)
@@ -6,7 +6,7 @@
 +++ b/tox.ini
 @@ -1,5 +1,6 @@
  [tox]
- envlist=py27,py26,py25,py32,py33,docs,pypy
+ envlist=py25,py27,py26,py32,py33,pypy
 +sitepackages=True
  
  [testenv:X]

Deleted: packages/tox/trunk/debian/patches/pytest-dep-version.patch
===================================================================
--- packages/tox/trunk/debian/patches/pytest-dep-version.patch	2013-08-18 23:54:40 UTC (rev 9982)
+++ packages/tox/trunk/debian/patches/pytest-dep-version.patch	2013-08-20 16:09:26 UTC (rev 9983)
@@ -1,18 +0,0 @@
---- a/tox.ini
-+++ b/tox.ini
-@@ -6,9 +6,12 @@
- commands=echo {posargs}
- 
- [testenv]
--commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
--deps=pytest==2.3.4
--     pytest-instafail
-+#commands=py.test --instafail --junitxml={envlogdir}/junit-{envname}.xml {posargs}
-+#deps=
-+#     pytest-instafail
-+
-+commands=py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
-+deps=
- 
- [testenv:py25]
- setenvs =

Modified: packages/tox/trunk/debian/patches/series
===================================================================
--- packages/tox/trunk/debian/patches/series	2013-08-18 23:54:40 UTC (rev 9982)
+++ packages/tox/trunk/debian/patches/series	2013-08-20 16:09:26 UTC (rev 9983)
@@ -1,3 +1,3 @@
 intersphinx_mapping.patch
 no-download.patch
-pytest-dep-version.patch
+testenv-deps.patch

Added: packages/tox/trunk/debian/patches/testenv-deps.patch
===================================================================
--- packages/tox/trunk/debian/patches/testenv-deps.patch	                        (rev 0)
+++ packages/tox/trunk/debian/patches/testenv-deps.patch	2013-08-20 16:09:26 UTC (rev 9983)
@@ -0,0 +1,21 @@
+Description: Prevent failures due to inability to download pytest.
+ Just get this from the archive during builds.
+Author: Barry Warsaw <barry at debian.org>
+Forwarded: not-needed
+
+--- a/tox.ini
++++ b/tox.ini
+@@ -7,13 +7,11 @@
+ 
+ [testenv]
+ commands=py.test  --junitxml={envlogdir}/junit-{envname}.xml {posargs}
+-deps=pytest>=2.3.5
+ 
+ [testenv:docs]
+ basepython=python
+ changedir=doc
+ deps=sphinx
+-     {[testenv]deps}
+ commands=
+     py.test -v \
+         --junitxml={envlogdir}/junit-{envname}.xml \

Deleted: packages/tox/trunk/debian/patches/upstream-issue58.patch
===================================================================
--- packages/tox/trunk/debian/patches/upstream-issue58.patch	2013-08-18 23:54:40 UTC (rev 9982)
+++ packages/tox/trunk/debian/patches/upstream-issue58.patch	2013-08-20 16:09:26 UTC (rev 9983)
@@ -1,13 +0,0 @@
-Description: Fix typos in the LICENSE file.
-Author: Barry Warsaw <barry at python.org>
-Forwarded: not-needed
-Bug: https://bitbucket.org/hpk42/tox/issue/58/typos-in-license-file
-
---- a/LICENSE
-+++ b/LICENSE
-@@ -1,4 +1,4 @@
--The execnet package is released under the provisions of the Gnu Public
-+The tox package is released under the provisions of the GNU General Public
- License (GPL), version 2 or later.  
- 
- See http://www.fsf.org/licensing/licenses/ for more information.