[Python-modules-commits] [python-pip] 01/04: Implement rewheeling dependent packages via dirtbike.
Barry Warsaw
barry at moszumanska.debian.org
Mon Jan 25 20:33:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch dirtbike
in repository python-pip.
commit f8688be28e4ed3348a4513f74057faa37e82968a
Author: Barry Warsaw <barry at python.org>
Date: Fri Dec 11 17:05:29 2015 -0500
Implement rewheeling dependent packages via dirtbike.
* d/rules:
- Remove the python-pip-whl binary package since we will be rewheeling
packages at build-time into a private directory.
- Add the python-pip-common binary package which will contain the
rewheeled .whl files.
python-pip-common in all cases. This fixes the problem where pip used
- Build-Depends: Add python3-{cachecontrol,chardet,colorama,distlib,
html5lib,requests,six,urllib3} for rewheeling.
* d/rules:
- Use the upstream recommended way to devendorize.
- Use dirtbike to rewheel the dependent packages.
* d/python-pip-whl.install: Removed.
* d/python-pip-common.install: Added.
---
debian/changelog | 14 ++++++++++++--
debian/control | 34 ++++++++++++++--------------------
debian/python-pip-common.install | 1 +
debian/python-pip-whl.install | 2 --
debian/rules | 10 ++++++++++
5 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 41ba65a..594752f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,12 +11,22 @@ python-pip (7.1.2-1) UNRELEASED; urgency=medium
- Pass `-m 'not network` to test suite
* New upstream release.
* d/control:
+ - Remove the python-pip-whl binary package since we will be rewheeling
+ packages at build-time into a private directory.
+ - Add the python-pip-common binary package which will contain the
+ rewheeled .whl files.
- Change Depends for python-pip and python3-pip to require
- python-pip-whl in all cases. This fixes the problem where pip used
+ python-pip-common in all cases. This fixes the problem where pip used
outside of a virtual environment can get broken by packages installed
into /usr/local.
- Update Homepage.
- * d/rules: Use the upstream recommended way to devendorize.
+ - Build-Depends: Add python3-{cachecontrol,chardet,colorama,distlib,
+ html5lib,requests,six,urllib3} for rewheeling.
+ * d/rules:
+ - Use the upstream recommended way to devendorize.
+ - Use dirtbike to rewheel the dependent packages.
+ * d/python-pip-whl.install: Removed.
+ * d/python-pip-common.install: Added.
* d/patches:
- de-vendorize.patch, better-error-message.patch: No longer needed.
- Updated use-wheels.patch.
diff --git a/debian/control b/debian/control
index edddc57..5d7c6fd 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders: Barry Warsaw <barry at debian.org>,
Homepage: https://pip.pypa.io/en/stable/
Build-Depends: debhelper (>= 8),
dh-python,
+ dirtbike,
python-all (>= 2.6),
python-docutils,
python-mock,
@@ -16,10 +17,18 @@ Build-Depends: debhelper (>= 8),
python-setuptools,
python-virtualenv,
python3-all,
+ python3-cachecontrol,
+ python3-chardet,
+ python3-colorama,
+ python3-distlib,
+ python3-html5lib,
python3-mock,
python3-pytest,
+ python3-requests,
python3-scripttest,
python3-setuptools,
+ python3-six,
+ python3-urllib3,
python3-wheel
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
@@ -29,10 +38,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/python-modules/packages/python-pip.g
Package: python-pip
Architecture: all
-Depends: ca-certificates,
- python-pip-whl,
- ${misc:Depends},
- ${python:Depends}
+Depends: ca-certificates, ${misc:Depends}, ${python:Depends}
Recommends: build-essential, python-dev-all (>= 2.6), python-wheel
Description: alternative Python package installer
pip is a replacement for easy_install, and is intended to be an improved
@@ -42,10 +48,7 @@ Description: alternative Python package installer
Package: python3-pip
Architecture: all
-Depends: ca-certificates,
- python-pip-whl,
- ${misc:Depends},
- ${python3:Depends}
+Depends: ca-certificates, ${misc:Depends}, ${python3:Depends}
Recommends: build-essential, python3-dev (>= 3.2), python3-wheel
Description: alternative Python package installer - Python 3 version of the package
pip is a replacement for easy_install, and is intended to be an improved
@@ -55,22 +58,13 @@ Description: alternative Python package installer - Python 3 version of the pack
.
This is the Python 3 version of the package.
-Package: python-pip-whl
+Package: python-pip-common
Architecture: all
-Depends: python-chardet-whl,
- python-colorama-whl,
- python-distlib-whl,
- python-html5lib-whl,
- python-requests-whl,
- python-setuptools-whl,
- python-six-whl,
- python-urllib3-whl,
- ${misc:Depends}
+Depends: ${misc:Depends}
Description: alternative Python package installer
pip is a replacement for easy_install, and is intended to be an improved
Python package installer. It integrates with virtualenv, doesn't do partial
installs, can save package state for replaying, can install from non-egg
sources, and can install from version control repositories.
.
- This is the support package for the PEP 427 wheel version of the package,
- required for using pip inside a virtual environment.
+ This is the common support package for pip.
diff --git a/debian/python-pip-common.install b/debian/python-pip-common.install
new file mode 100644
index 0000000..1cf1c1b
--- /dev/null
+++ b/debian/python-pip-common.install
@@ -0,0 +1 @@
+dist/*.whl usr/share/python-pip-common/wheels
diff --git a/debian/python-pip-whl.install b/debian/python-pip-whl.install
deleted file mode 100644
index b6c795b..0000000
--- a/debian/python-pip-whl.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/pip.dependencies usr/share/python-wheels
-usr/share/python-wheels
diff --git a/debian/rules b/debian/rules
index e8227bc..316f406 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,16 @@ override_dh_auto_build:
-not -regex 'pip/_vendor$$' \
-exec rm -rf {} \;
dh_auto_build
+ dirtbike cachecontrol
+ dirtbike chardet
+ dirtbike colorama
+ dirtbike distlib
+ dirtbike html5lib
+ dirtbike requests
+ dirtbike setuptools
+ dirtbike six
+ dirtbike urllib3
+ mkdir -p debian/python-pip-common/usr/share/python-pip-common/wheels
override_dh_python3:
dh_python3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pip.git
More information about the Python-modules-commits
mailing list