[Python-modules-commits] r32958 - in packages/python-virtualenv/trunk/debian (7 files)

barry at users.alioth.debian.org barry at users.alioth.debian.org
Thu Jun 11 21:54:08 UTC 2015 

    Date: Thursday, June 11, 2015 @ 21:54:07
  Author: barry
Revision: 32958

* New upstream release.
* d/control:
  - Bump Standards-Version with no other changes necessary.
  - Bump debhelper Build-Depends to version 9.
  - Add new test dependencies to Build-Depends-Indep.
* d/compat: Bump to version 9.
* d/rules:
  - Temporarily disable the tests due to upstream issue #714 (the tests
    directory is missing from the PyPI tarball).
  - The upstream changes file has been renamed to docs/changes.rst.
* d/watch: Use pypi.debian.net redirector.

Modified:
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/compat
  packages/python-virtualenv/trunk/debian/control
  packages/python-virtualenv/trunk/debian/patches/entry-points.patch
  packages/python-virtualenv/trunk/debian/patches/use-wheels.patch
  packages/python-virtualenv/trunk/debian/rules
  packages/python-virtualenv/trunk/debian/watch

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/changelog	2015-06-11 21:54:07 UTC (rev 32958)
@@ -1,3 +1,19 @@
+python-virtualenv (13.0.3+ds-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * d/control:
+    - Bump Standards-Version with no other changes necessary.
+    - Bump debhelper Build-Depends to version 9.
+    - Add new test dependencies to Build-Depends-Indep.
+  * d/compat: Bump to version 9.
+  * d/rules:
+    - Temporarily disable the tests due to upstream issue #714 (the tests
+      directory is missing from the PyPI tarball).
+    - The upstream changes file has been renamed to docs/changes.rst.
+  * d/watch: Use pypi.debian.net redirector.
+
+ -- Barry Warsaw <barry at debian.org>  Thu, 11 Jun 2015 17:19:27 -0400
+
 python-virtualenv (1.11.6+ds-1) unstable; urgency=medium
 
   [ Daniele Tricoli ]

Modified: packages/python-virtualenv/trunk/debian/compat
===================================================================
--- packages/python-virtualenv/trunk/debian/compat	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/compat	2015-06-11 21:54:07 UTC (rev 32958)
@@ -1 +1 @@
-8
+9

Modified: packages/python-virtualenv/trunk/debian/control
===================================================================
--- packages/python-virtualenv/trunk/debian/control	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/control	2015-06-11 21:54:07 UTC (rev 32958)
@@ -9,7 +9,7 @@
 Homepage: http://pypi.python.org/pypi/virtualenv
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-virtualenv/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-virtualenv/trunk/
-Build-Depends: debhelper (>= 8.1),
+Build-Depends: debhelper (>= 9),
                dh-python,
                python-all (>=2.6.6-3~),
                python3-all,
@@ -18,12 +18,14 @@
 Build-Depends-Indep: python-mock,
                      python-nose,
                      python-pip-whl,
+                     python-pytest,
                      python-setuptools,
                      python-setuptools-whl,
                      python3-mock,
                      python3-nose,
+                     python3-pytest,
                      python3-setuptools
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.3
 

Modified: packages/python-virtualenv/trunk/debian/patches/entry-points.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/entry-points.patch	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/patches/entry-points.patch	2015-06-11 21:54:07 UTC (rev 32958)
@@ -5,7 +5,7 @@
 
 --- a/setup.py
 +++ b/setup.py
-@@ -9,7 +9,6 @@
+@@ -32,7 +32,6 @@
          'entry_points': {
              'console_scripts': [
                  'virtualenv=virtualenv:main',

Modified: packages/python-virtualenv/trunk/debian/patches/use-wheels.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/patches/use-wheels.patch	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/patches/use-wheels.patch	2015-06-11 21:54:07 UTC (rev 32958)
@@ -23,7 +23,7 @@
  virtualenv.main()
 --- a/setup.py
 +++ b/setup.py
-@@ -83,6 +83,6 @@
+@@ -105,6 +105,6 @@
      url='https://virtualenv.pypa.io/',
      license='MIT',
      py_modules=['virtualenv'],
@@ -45,17 +45,20 @@
  if sys.version_info < (2, 6):
      print('ERROR: %s' % sys.exc_info()[1])
      print('ERROR: this script requires Python 2.6 or greater.')
-@@ -526,7 +530,8 @@
+@@ -526,7 +530,11 @@
+ 
  def file_search_dirs():
      here = os.path.dirname(os.path.abspath(__file__))
-     dirs = ['.', here,
--            join(here, 'virtualenv_support')]
-+            #join(here, 'virtualenv_support')]
-+            '/usr/share/python-wheels/']
+-    dirs = [here, join(here, 'virtualenv_support')]
++    # Debian: Barry Warsaw <barry at debian.org> 2015-06-11
++    # Don't include the bundled wheels in the search dirs, since we strip them
++    # out in favor of the system wheels.
++    #dirs = [here, join(here, 'virtualenv_support')]
++    dirs = [here, '/usr/share/python-wheels/']
      if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
          # Probably some boot script; just in case virtualenv is installed...
          try:
-@@ -855,7 +860,16 @@
+@@ -863,7 +871,16 @@
              for varname in remove_from_env:
                  env.pop(varname, None)
      else:
@@ -73,7 +76,7 @@
      try:
          proc = subprocess.Popen(
              cmd, stderr=subprocess.STDOUT, stdin=None, stdout=stdout,
-@@ -985,6 +999,31 @@
+@@ -995,6 +1012,31 @@
  
      install_distutils(home_dir)
  

Modified: packages/python-virtualenv/trunk/debian/rules
===================================================================
--- packages/python-virtualenv/trunk/debian/rules	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/rules	2015-06-11 21:54:07 UTC (rev 32958)
@@ -5,6 +5,10 @@
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
+# Temporarily disable the tests due to
+# https://github.com/pypa/virtualenv/issues/714
+override_dh_auto_test:
+
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3
 
@@ -22,4 +26,4 @@
 	rm -rf debian/python3-virtualenv/usr/bin
 
 override_dh_installchangelogs:
-	dh_installchangelogs docs/news.rst
+	dh_installchangelogs docs/changes.rst

Modified: packages/python-virtualenv/trunk/debian/watch
===================================================================
--- packages/python-virtualenv/trunk/debian/watch	2015-06-11 16:04:12 UTC (rev 32957)
+++ packages/python-virtualenv/trunk/debian/watch	2015-06-11 21:54:07 UTC (rev 32958)
@@ -1,3 +1,3 @@
 version=3
 opts=pgpsigurlmangle=s/$/.asc/,dversionmangle=s/\+ds$//,repacksuffix=+ds \
-https://pypi.python.org/packages/source/v/virtualenv/ virtualenv-(.*)\.tar\.gz
+http://pypi.debian.net/virtualenv/virtualenv-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

More information about the Python-modules-commits mailing list