Merge lp://staging/~tribaal/storm/storm-packaging-fix-python-central into lp://staging/~landscape/storm/storm-packaging-lds

Proposed by Chris Glass
Status: Merged
Merged at revision: 14
Proposed branch: lp://staging/~tribaal/storm/storm-packaging-fix-python-central
Merge into: lp://staging/~landscape/storm/storm-packaging-lds
Diff against target: 554 lines (+378/-96)
13 files modified
changelog (+6/-0)
compat (+1/-1)
control (+72/-32)
copyright (+256/-33)
docs (+2/-0)
install (+4/-0)
patches/allow-zope-component.patch (+14/-0)
patches/no-tests-in-deb.patch (+0/-13)
patches/series (+1/-0)
pycompat (+0/-1)
python-storm-dbg.install (+1/-0)
rules (+20/-16)
source/format (+1/-0)
To merge this branch: bzr merge lp://staging/~tribaal/storm/storm-packaging-fix-python-central
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Landscape Pending
Review via email: mp+203737@code.staging.launchpad.net

Description of the change

Fixes the packaging for trusty.

To post a comment you must log in.
22. By Chris Glass

Changed maintainer to point to us (<email address hidden>)

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Try with this patch to disable the test suite if it's building in a ppa. I grabbed this trick from juju-deployer, which disables tests that require networking if DEB_BUILD_ARCH or TESTING_ENVIRONMENT are set.

=== modified file 'rules'
--- rules revid:<email address hidden>
+++ rules 2014-01-30 19:18:09 +0000
@@ -10,11 +10,15 @@
  rm -rf storm.egg-info

 override_dh_auto_test:
+# don't run tests if the user set nocheck
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- for python in $(shell pyversions -r); do \
- $$python setup.py test; \
- $$python-dbg setup.py test; \
- done
+# don't run tests if in a ppa builder
+ ifeq (,$(DEB_BUILD_ARCH))
+ for python in $(shell pyversions -r); do \
+ $$python setup.py test; \
+ $$python-dbg setup.py test; \
+ done
+ endif
 endif

 override_dh_strip:

Watch tab/spaces above: the "ifeq" and "endif" statements use spaces, the rest uses tabs (makefile syntax).

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Actually, juju-deployer checks this this:

TEST_OFFLINE = ("DEB_BUILD_ARCH" in os.environ or "TEST_OFFLINE" in os.environ)

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Forget that DEB_BUILD_ARCH test, doesn't seem to work, I get it defined when building locally.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Actually, it might work :)

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Actually², let's disable tests during package build for now.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Ok, with this patch http://pastebin.ubuntu.com/6845731/ it builds and runs *some* tests.

I also removed the Vcs options, no sense in pointing to that if we are keeping our own packaging branch I think.

Here is a build log with the patch applied:
http://pastebin.ubuntu.com/6845736/

review: Needs Fixing
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

http://pastebin.ubuntu.com/6845894/ buildlog for precise, also with the above patch applied.

23. By Chris Glass

Applying Andreas's patch to change the way tests are run.

Revision history for this message
Chris Glass (tribaal) wrote :

Patch applied - it seems to build fine indeed (https://launchpad.net/~tribaal/+archive/storm-trunk-ppa).
Thanks a lot!

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Nice, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: