Merge lp://qastaging/~jml/pkgme/buildout into lp://qastaging/pkgme

Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: 137
Merged at revision: 126
Proposed branch: lp://qastaging/~jml/pkgme/buildout
Merge into: lp://qastaging/pkgme
Diff against target: 847 lines (+552/-66)
11 files modified
.bzrignore (+6/-0)
.testr.conf (+1/-1)
Makefile (+18/-0)
README.txt (+29/-22)
bootstrap.py (+262/-0)
buildout.cfg (+36/-0)
buildout.mk (+80/-0)
distribute_setup.py (+74/-36)
sphinx.mk (+3/-3)
tarmac_tests.sh (+7/-4)
versions.cfg (+36/-0)
To merge this branch: bzr merge lp://qastaging/~jml/pkgme/buildout
Reviewer Review Type Date Requested Status
Jonathan Lange Approve
Review via email: mp+117924@code.qastaging.launchpad.net

Commit message

Convert pkgme to buildout. (james_w)

Description of the change

Testing things.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Cheating.

review: Approve
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (18.6 KiB)

The attempt to merge lp:~jml/pkgme/buildout into lp:pkgme failed. Below is the output from the failed tests.

[ -d ../download-cache ] || bzr checkout lp:ca-download-cache ../download-cache
ln -s ../download-cache download-cache
python2.7 bootstrap.py --distribute --setup-source distribute_setup.py \
    --download-base=download-cache/dist --eggs=eggs \
    --version 1.5.1
touch --no-create bin/buildout
./bin/py -m testtools.run pkgme.tests.test_suite
Tests running...
======================================================================
ERROR: pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_missing_reason
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_backend.py", line 129, in test_want_script_with_missing_reason
    self.assertEqual((10, None), backend.want(tempdir.path))
  File "pkgme/backend.py", line 205, in want
    return self._parse_want_output(out)
  File "pkgme/backend.py", line 168, in _parse_want_output
    "returned invalid score", str(result))
WantError: Backend pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_missing_reason-1 (/tmp/pkgme-tests-jUGbDV) returned invalid score from 'want' script: '\'import site\' failed; use -v for traceback\n{"score": 10}'
======================================================================
ERROR: pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_reason
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_backend.py", line 86, in test_want_script_with_reason
    self.assertEqual((10, reason), backend.want(tempdir.path))
  File "pkgme/backend.py", line 205, in want
    return self._parse_want_output(out)
  File "pkgme/backend.py", line 168, in _parse_want_output
    "returned invalid score", str(result))
WantError: Backend pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_reason-2 (/tmp/pkgme-tests-DfjfIv) returned invalid score from 'want' script: '\'import site\' failed; use -v for traceback\n{"reason": "pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_reason-1", "score": 10}'
======================================================================
ERROR: pkgme.tests.test_script.ScriptTests.test_builds_source_package
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_script.py", line 74, in test_builds_source_package
    self.run_script(tempdir.abspath('foo'))
  File "pkgme/tests/test_script.py", line 50, in run_script
    ep(argv=argv, target_dir=cwd, interactive=False)
  File "pkgme/bin/main.py", line 131, in main
    write_packaging(target_dir, distribution=options.distro)
  File "pkgme/__init__.py", line 39, in write_packaging
    info = get_info_for(path, allowed_backend_names=allowed_backend_names)
  File "pkgme/backend.py", line 82, in get_info_for
    return selector.get_info(path)
  File "pkgme/backend.py", line 344, in get_info
    eligble = self.get_eligible_backends(path)
  File "pkgme/backend.py", line 328, in get_elig...

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :
Download full text (12.2 KiB)

The attempt to merge lp:~jml/pkgme/buildout into lp:pkgme failed. Below is the output from the failed tests.

[ -d ../download-cache ] || bzr checkout lp:ca-download-cache ../download-cache
ln -s ../download-cache download-cache
./bin/py -m testtools.run pkgme.tests.test_suite
Tests running...
======================================================================
ERROR: pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_missing_reason
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_backend.py", line 129, in test_want_script_with_missing_reason
    self.assertEqual((10, None), backend.want(tempdir.path))
  File "pkgme/backend.py", line 205, in want
    return self._parse_want_output(out)
  File "pkgme/backend.py", line 168, in _parse_want_output
    "returned invalid score", str(result))
WantError: Backend pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_missing_reason-1 (/tmp/pkgme-tests-0yMH2h) returned invalid score from 'want' script: '\'import site\' failed; use -v for traceback\n{"score": 10}'
======================================================================
ERROR: pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_reason
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_backend.py", line 86, in test_want_script_with_reason
    self.assertEqual((10, reason), backend.want(tempdir.path))
  File "pkgme/backend.py", line 205, in want
    return self._parse_want_output(out)
  File "pkgme/backend.py", line 168, in _parse_want_output
    "returned invalid score", str(result))
WantError: Backend pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_reason-2 (/tmp/pkgme-tests-5TA4Ln) returned invalid score from 'want' script: '\'import site\' failed; use -v for traceback\n{"reason": "pkgme.tests.test_backend.ExternalHelpersBackendTests.test_want_script_with_reason-1", "score": 10}'
======================================================================
ERROR: pkgme.tests.test_script.ScriptTests.test_builds_source_package
----------------------------------------------------------------------
Traceback (most recent call last):
  File "pkgme/tests/test_script.py", line 74, in test_builds_source_package
    self.run_script(tempdir.abspath('foo'))
  File "pkgme/tests/test_script.py", line 50, in run_script
    ep(argv=argv, target_dir=cwd, interactive=False)
  File "pkgme/bin/main.py", line 131, in main
    write_packaging(target_dir, distribution=options.distro)
  File "pkgme/__init__.py", line 39, in write_packaging
    info = get_info_for(path, allowed_backend_names=allowed_backend_names)
  File "pkgme/backend.py", line 82, in get_info_for
    return selector.get_info(path)
  File "pkgme/backend.py", line 344, in get_info
    eligble = self.get_eligible_backends(path)
  File "pkgme/backend.py", line 328, in get_eligible_backends
    score, reason = backend.want(path)
  File "pkgme/backend.py", line 205, in want
    return self._parse_want_output(out)
  File "pkgme/backend.py", line 168, in ...

lp://qastaging/~jml/pkgme/buildout updated
134. By Jonathan Lange

Get a traceback, hopefully

135. By Jonathan Lange

What happens if we don't specify which Python?

136. By Jonathan Lange

Go back to using env.

137. By Jonathan Lange

Require argparse, since Jenkins runs tests on Python 2.6

Revision history for this message
Jonathan Lange (jml) wrote :

Require argparse, float the Python version.

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