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

barry at users.alioth.debian.org barry at users.alioth.debian.org
Tue Jun 10 18:34:33 UTC 2014 

    Date: Tuesday, June 10, 2014 @ 18:34:31
  Author: barry
Revision: 29284

  - New upstream release.
  - /usr/bin/virtualenv is now a Python 3 application.
  - Use -whl packages instead of embedded wheel copies.
    (Closes: #719767, Closes: #739195)
  - Add binary packages python3-virtualenv (for the Python 3 compatible
    library), and virtualenv (for the /usr/bin executable and manpage).
    python-virtualenv now only contains the Python 2 compatible library,
    and for backward compatibility, it Recommends virtualenv.
    python-virtualenv no longer recommends pip.
  - Build-Depends: add dh-python, and python3-all.
  of /usr/share/python-wheels, and the archive's python-*-whl packages.
* d/rules:
  - Switch to pybuild and simplify.  Now that we're using the
  - Add support for dh_python3.
* d/virtualenv.manpages: Replaces debian/manpages.

Added:
  packages/python-virtualenv/trunk/debian/virtualenv.manpages
    (from rev 29153, packages/python-virtualenv/trunk/debian/manpages)
Modified:
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/control
  packages/python-virtualenv/trunk/debian/rules
Deleted:
  packages/python-virtualenv/trunk/debian/manpages

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2014-06-10 08:56:53 UTC (rev 29283)
+++ packages/python-virtualenv/trunk/debian/changelog	2014-06-10 18:34:31 UTC (rev 29284)
@@ -1,14 +1,19 @@
 python-virtualenv (1.11.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
-  * New upstream release.
-  * /usr/bin/virtualenv is now a Python 3 application.  As an import, the
-    virtualenv module is only available for Python 3 now (needed by tox
-    and with no other effects in the archive).
+    - New upstream release.
+    - /usr/bin/virtualenv is now a Python 3 application.
+    - Use -whl packages instead of embedded wheel copies.
+      (Closes: #719767, Closes: #739195)
   * d/control:
+    - Add binary packages python3-virtualenv (for the Python 3 compatible
+      library), and virtualenv (for the /usr/bin executable and manpage).
+      python-virtualenv now only contains the Python 2 compatible library,
+      and for backward compatibility, it Recommends virtualenv.
+      python-virtualenv no longer recommends pip.
     - Depend on the appropriate -whl packages to properly de-vendorize,
       and switch to python3 and python3-pkg-resources.
-    - Build-Depends: add dh-python, and switch to python3-all.
+    - Build-Depends: add dh-python, and python3-all.
     - Build-Depends-Indep: add python-pip-whl and python-setuptools-whl.
     - Add myself to Uploaders.
     - Add X-Python3-Version.
@@ -16,8 +21,7 @@
     - wrap-and-sort
   * d/install: Don't install the .whl files into
     /usr/share/python-virtualenv.  Now we use the policy-approved location
-    of /usr/share/python-wheels, and we use the archive's python-*-whl
-    packages.
+    of /usr/share/python-wheels, and the archive's python-*-whl packages.
   * d/patches:
     - look_for_external_files.patch: Removed.  This patch is obsoleted by
       user-wheels.patch.
@@ -27,10 +31,13 @@
     - use-wheels.patch: Added; use the system -whl packages instead of the
       vendorized versions.
     - system-python.patch: Update to /usr/bin/python3 shebang.
-  * d/rules: Switch to pybuild and simplify.  Now that we're using the
-    system wheels, we don't need to repack the bundled versions.
+  * d/rules:
+    - Switch to pybuild and simplify.  Now that we're using the
+      system wheels, we don't need to repack the bundled versions.
+    - Add support for dh_python3.
+  * d/virtualenv.manpages: Replaces debian/manpages.
 
- -- Barry Warsaw <barry at debian.org>  Mon, 02 Jun 2014 17:09:11 -0400
+ -- Barry Warsaw <barry at debian.org>  Mon, 10 Jun 2014 17:09:11 -0400
 
 python-virtualenv (1.11.4-1) unstable; urgency=medium
 

Modified: packages/python-virtualenv/trunk/debian/control
===================================================================
--- packages/python-virtualenv/trunk/debian/control	2014-06-10 08:56:53 UTC (rev 29283)
+++ packages/python-virtualenv/trunk/debian/control	2014-06-10 18:34:31 UTC (rev 29284)
@@ -9,26 +9,66 @@
 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), dh-python, python3-all, unzip, zip
-Build-Depends-Indep: python-pip-whl,
+Build-Depends: debhelper (>= 8.1),
+               dh-python,
+               python-all (>=2.6.6-3~),
+               python3-all,
+               unzip,
+               zip
+Build-Depends-Indep: python-mock,
+                     python-nose,
+                     python-pip-whl,
+                     python-setuptools,
                      python-setuptools-whl,
                      python3-mock,
                      python3-nose,
                      python3-setuptools
 Standards-Version: 3.9.5
+X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.3
 
 Package: python-virtualenv
 Architecture: all
-Depends: python3,
+Depends: python,
          python-pip-whl,
+         python-pkg-resources,
          python-setuptools-whl,
+         ${misc:Depends},
+         ${python3:Depends}
+Recommends: virtualenv
+Description: Python virtual environment creator
+ The virtualenv utility creates virtual Python instances, each invokable
+ with its own Python executable.  Each instance can have different sets
+ of modules, installable via easy_install.  Virtual Python instances can
+ also be created without root access.
+ .
+ This is the Python 2 version of the library.
+
+Package: python3-virtualenv
+Architecture: all
+Depends: python-pip-whl,
+         python-setuptools-whl,
+         python3,
          python3-pkg-resources,
          ${misc:Depends},
          ${python3:Depends}
-Recommends: python3-pip (>= 0.7.2)
 Description: Python virtual environment creator
  The virtualenv utility creates virtual Python instances, each invokable
  with its own Python executable.  Each instance can have different sets
  of modules, installable via easy_install.  Virtual Python instances can
  also be created without root access.
+ .
+ This is the Python 3 version of the library.
+
+Package: virtualenv
+Architecture: all
+Depends: python3-virtualenv, ${misc:Depends}
+Replaces: python-virtualenv (<< 1.11.6)
+Breaks: python-virtualenv (<< 1.11.6)
+Description: Python virtual environment creator
+ The virtualenv utility creates virtual Python instances, each invokable
+ with its own Python executable.  Each instance can have different sets
+ of modules, installable via easy_install.  Virtual Python instances can
+ also be created without root access.
+ .
+ This is the command line script and manpage.

Deleted: packages/python-virtualenv/trunk/debian/manpages
===================================================================
--- packages/python-virtualenv/trunk/debian/manpages	2014-06-10 08:56:53 UTC (rev 29283)
+++ packages/python-virtualenv/trunk/debian/manpages	2014-06-10 18:34:31 UTC (rev 29284)
@@ -1 +0,0 @@
-debian/virtualenv.1

Modified: packages/python-virtualenv/trunk/debian/rules
===================================================================
--- packages/python-virtualenv/trunk/debian/rules	2014-06-10 08:56:53 UTC (rev 29283)
+++ packages/python-virtualenv/trunk/debian/rules	2014-06-10 18:34:31 UTC (rev 29284)
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-# This doesn't actually help.
 export PYBUILD_NAME=virtualenv
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python2,python3 --buildsystem=pybuild
 
 override_dh_auto_configure:
 	# Remove the embedded wheels in favor of the -whl packages.
@@ -13,10 +12,19 @@
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3
-	# This is an ugly hack since pybuild doesn't seem to DTRT.
-	find debian/python-virtualenv -name __pycache__ | xargs rm -rf
-	mv debian/python-virtualenv/usr/lib/$(shell py3versions -d) \
-	   debian/python-virtualenv/usr/lib/python3
 
+override_dh_python2:
+	dh_python2
+	# No Python 2 cli script.
+	rm -rf debian/python-virtualenv/usr/bin
+
+override_dh_auto_install:
+	dh_auto_install
+	# Use the separate binary package for the cli script.
+	mkdir -p debian/virtualenv/usr/bin
+	mv debian/python3-virtualenv/usr/bin/virtualenv \
+	   debian/virtualenv/usr/bin
+	rm -rf debian/python3-virtualenv/usr/bin
+
 override_dh_installchangelogs:
 	dh_installchangelogs docs/news.rst

Copied: packages/python-virtualenv/trunk/debian/virtualenv.manpages (from rev 29153, packages/python-virtualenv/trunk/debian/manpages)
===================================================================
--- packages/python-virtualenv/trunk/debian/virtualenv.manpages	                        (rev 0)
+++ packages/python-virtualenv/trunk/debian/virtualenv.manpages	2014-06-10 18:34:31 UTC (rev 29284)
@@ -0,0 +1 @@
+debian/virtualenv.1

More information about the Python-modules-commits mailing list