Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195272
Change subject: Package python deps with dh-virtualenv
......................................................................
Package python deps with dh-virtualenv
* bump debhelper and debian/compat to 9
* Pre-Depends
Build command of doom:
echo USENETWORK=yes >> /root/.pbuilderrc
dh-virtualenv 0.9 package from upstream.
DEB_BUILD_OPTIONS=nocheck git-buildpackage -nc \
--git-debian-branch=debian-precise-venv \
--git-pbuilder \
--git-dist="precise-wikimedia" \
--git-pbuilder-options="--bindmount /packaging/deps/precise"
Bug: T48552
Change-Id: I7eb60ed9ffbbb60140e1dcfd516db51732167ed0
---
M debian/changelog
M debian/compat
M debian/control
M debian/copyright
M debian/docs
M debian/gbp.conf
M debian/install
M debian/rules
A debian/source/lintian-overrides
A debian/zuul.triggers
10 files changed, 130 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/zuul
refs/changes/72/195272/1
diff --git a/debian/changelog b/debian/changelog
index b586d61..b68d8ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+zuul (2.0.0-304-g685ca22-1) precise-wikimedia; urgency=low
+
+ * Snapshot from upstream, target is Wikimedia Ubuntu Precise which has some
+ updated packages for python modules packages.
+ * Adjust debian/gbp.conf to match our repository layout
+ * Bump debian/compat from 8 to 9
+ * Bump standard from 3.9.3 to 3.9.7
+ * Build for python 2.7 so we can get rid of the OrderDict and argparse
+ python modules which are only needed for python 2.6.
+ * Skip building sphinx doc entirely due to sphinx.programoutput not being
+ able to find the shipped commands (zuul, zuul-merger, zuul-cloner)
+ * Add dh-virtualenv to bring in additional dependencies not available in
+ Wikimedia Ubuntu Precise. Require an unreleased snapshot of dh-virtualenv
+ 0.9, see:
+ https://phabricator.wikimedia.org/T91631
+ https://github.com/spotify/dh-virtualenv/issues/78
+
+
+ -- Antoine Musso <has...@free.fr> Sat, 07 Mar 2015 21:00:13 +0100
+
zuul (1.3.0-1) UNRELEASED; urgency=low
* Initial release (Closes: #705844)
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index d6dd685..b624deb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,50 +1,91 @@
Source: zuul
Maintainer: Paul Belanger <paul.belan...@polybeacon.com>
+Uploaders: Antoine Musso <has...@free.fr>
Section: python
Priority: optional
-Build-Depends: debhelper (>= 8.0.0),
+Build-Depends: debhelper (>= 9),
+ dh-virtualenv (>= 0.9),
openstack-pkg-tools,
- python (>= 2.6)
+ python2.7
Build-Depends-Indep:
- python-extras,
- python-git (>= 0.3.2~RC1),
- python-jenkins,
- python-lockfile,
- python-nose,
- python-paramiko,
+#
+# Dependencies comes from upstream sources, they are not available under
+# Wikimedia Ubuntu Precise distribution and will be provided via dh-virtualenv.
+#
+###################################
+# requirements.txt
+###################################
+ python-pbr (>= 0.5.21),
+#Build in python 2.7:
+#python-argparse,
+ python-yaml (>= 3.1.0),
python-paste,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-statsd,
- python-voluptuous (<< 0.7),
python-webob,
- python-yaml
-Standards-Version: 3.9.3
-X-Python-Version: >= 2.6
+ python-paramiko,
+ python-git (= 0.3.2.RC1-1),
+ python-gitdb,
+ python-smmap,
+ python-lockfile (>= 0.8),
+#Build in python 2.7:
+#python-orderdict
+ python-daemon,
+ python-extras,
+#python-statsd (>= 1.0.0, <3.0)
+ python-voluptuous (>= 0.7),
+ python-gear (>= 0.5.4),
+ python-apscheduler (>= 2.1.1),
+#python-prettytable (>= 0.6),
+#python-babel (>= 1.0),
+#python-six (>= 1.6.0),
+###################################
+# test-requirements.txt
+###################################
+#python-hacking (>= 0.9.2),
+#python-coverage (>= 3.6),
+ python-sphinx (>= 1.0.7+dfsg),
+#python-sphinxcontrib.blockdiag (>= 0.5.5),
+#python-discover,
+#python-fixtures (>= 0.3.14),
+#python-keystoneclient (>= 0.4.2),
+ python-subunit,
+#python-swiftclient (>= 1.6),
+#python-testrepository (>= 0.0.17),
+#python-testtools (>= 0.9.32),
+#python-sphinxcontrib.programoutput
+###################################
+# Debian packaging dependencies
+###################################
+ python-nose
+Standards-Version: 3.9.6
+X-Python-Version: = 2.7
Homepage: https://launchpad.net/zuul
Vcs-Git: git://github.com/pabelanger/zuul-deb.git
Vcs-Browser: https://github.com/pabelanger/zuul-deb
Package: zuul
Architecture: all
+Pre-Depends: dpkg (>= 1.16.1),
+ python2.7,
+ ${misc:Pre-Depends}
Depends: adduser,
libjs-jquery,
libjs-underscore,
+ python-pbr (>= 0.5.21),
+ python-yaml (>= 3.1.0),
+ python-paste,
+ python-webob,
+ python-paramiko,
+ python-git (= 0.3.2.RC1-1),
+ python-lockfile (>= 0.8),
python-daemon,
python-extras,
- python-git (>= 0.3.2~RC1),
- python-jenkins,
- python-lockfile,
- python-paramiko,
- python-paste,
- python-voluptuous (<< 0.7),
- python-webob,
- python-yaml,
+ python-voluptuous (>= 0.7),
+ python-gear (>= 0.5.4),
+ python-apscheduler (>= 2.1.1),
${misc:Depends},
${python:Depends}
Suggests:
jenkins (>= 1.426),
- python-statsd
Description: Trunk gating system
Zuul is a program that is used to gate the source code repository of a project
so that changes are only merged if they pass tests.
diff --git a/debian/copyright b/debian/copyright
index aa25f45..70c22e3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,8 +14,8 @@
Files: debian/*
Copyright: 2012-2013 Paul Belanger <paul.belan...@polybeacon.com>
- 2013 Antoine Musso <has...@free.fr>
- 2013 Wikimedia Foundation Inc.
+ 2013-2015 Antoine Musso <has...@free.fr>
+ 2013-2015 Wikimedia Foundation Inc.
License: Apache
License: Apache
diff --git a/debian/docs b/debian/docs
index 6f20e48..201f494 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-build/docs/html
+#build/docs/html
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 1245b6f..e4152e9 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,9 @@
[git-buildpackage]
-export-dir = ../build-area/
-tarball-dir = ../tarballs/
-overlay = True
pristine-tar = False
compression = gzip
+
+ignore-branch = True
+
+debian-branch = HEAD
+upstream-tree = branch
+upstream-branch = HEAD
diff --git a/debian/install b/debian/install
index dd68bd5..4a791d6 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-debian/etc/zuul/* etc/zuul/
+#etc/zuul/* etc/zuul/
diff --git a/debian/rules b/debian/rules
index d7c9807..e5667d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
UPSTREAM_GIT = git://github.com/openstack-infra/zuul.git
@@ -10,11 +10,14 @@
export OSLO_PACKAGE_VERSION=$(VERSION)
%:
- dh $@ --with python2,sphinxdoc
+# dh $@ --with python2,sphinxdoc
+ dh $@ --with python-virtualenv
override_dh_auto_build:
dh_auto_build
- $(MAKE) -C doc html man BUILDDIR=$(CURDIR)/build/docs
+# $(MAKE) -C doc html man BUILDDIR=$(CURDIR)/build/docs
+ mkdir -p $(CURDIR)/build/docs/html
+ mkdir -p $(CURDIR)/build/docs/man
override_dh_auto_clean:
dh_auto_clean
@@ -26,6 +29,25 @@
install -D -m 0644 $(CURDIR)/etc/logging.conf-sample
$(CURDIR)/debian/etc/zuul/logging.conf
install -D -m 0644 $(CURDIR)/etc/zuul.conf-sample
$(CURDIR)/debian/etc/zuul/zuul.conf
+# OSLO_PACKAGE_VERSION would cause pbr to set version for any dependent package
+# installed via dh-virtualenv. Probably related:
+# https://bugs.launchpad.net/pbr/+bug/1256138
+#unexport OSLO_PACKAGE_VERSION
+override_dh_virtualenv:
+ # test-requirements.txt ships testtools which fails importing unittest2
+ # we run tests with nose anyway.
+ #cat $(CURDIR)/test-requirements.txt >> $(CURDIR)/requirements.txt
+ #
+ # Needs dh_virtualenv 0.9+ for --use-system-packages
+ #
+ dh_virtualenv \
+ --setuptools \
+ --use-system-packages \
+ --no-package ordereddict \
+ --no-package paramiko \
+ --no-package WebOb \
+ --pypi-url https://pypi.python.org/simple
+
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
nosetests
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..bbaa920
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1 @@
+python-depends-but-no-python-helper
diff --git a/debian/zuul.triggers b/debian/zuul.triggers
new file mode 100644
index 0000000..9031489
--- /dev/null
+++ b/debian/zuul.triggers
@@ -0,0 +1,8 @@
+# Register interest in Python interpreter changes (Python 2 for now); and
+# don't make the Python package dependent on the virtualenv package
+# processing (noawait)
+interest-noawait /usr/bin/python2.6
+interest-noawait /usr/bin/python2.7
+
+# Also provide a symbolic trigger for all dh-virtualenv packages
+interest dh-virtualenv-interpreter-update
--
To view, visit https://gerrit.wikimedia.org/r/195272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7eb60ed9ffbbb60140e1dcfd516db51732167ed0
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
Gerrit-Branch: debian/precise-wikimedia
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
