Merge lp:~cjohnston/ubuntu-ci-services-itself/1286331 into lp:ubuntu-ci-services-itself

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 293
Merged at revision: 296
Proposed branch: lp:~cjohnston/ubuntu-ci-services-itself/1286331
Merge into: lp:ubuntu-ci-services-itself
Diff against target: 19 lines (+0/-4)
1 file modified
cli/setup.py (+0/-4)
To merge this branch: bzr merge lp:~cjohnston/ubuntu-ci-services-itself/1286331
Reviewer Review Type Date Requested Status
Chris Johnston (community) Approve
Ursula Junque (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+208882@code.launchpad.net

Commit message

CLI: Remove tests_require in order to not break ./run-tests

To post a comment you must log in.
Revision history for this message
Ursula Junque (ursinha) wrote :

Is this the right thing to do? It seems run-tests should be able to figure out where the dependencies are, instead of us forcing the test dependencies as regular ones.

Revision history for this message
Chris Johnston (cjohnston) wrote :

Completely agree.. This is a quick work around until run-tests is able to
be properly fixed. I'm filing a bug to have run-tests properly fixed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:293
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/258/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/258/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ursula Junque (ursinha) wrote :

Roger that, approving :)

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

 merge approved

   1. Bug #1286347 filed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cli/setup.py'
2--- cli/setup.py 2014-02-28 09:25:47 +0000
3+++ cli/setup.py 2014-02-28 20:46:06 +0000
4@@ -27,15 +27,11 @@
5 'dput>=1.6',
6 'lazr.enum>=1.1.2',
7 'PyYAML==3.10',
8-]
9-
10-tests_require = [
11 'mock==1.0.1',
12 'testfixtures>=3.0.1',
13 ]
14
15 extra = {
16- 'tests_require': tests_require,
17 'scripts': ['ubuntu-ci'],
18 'requires_openstack': True,
19 }

Subscribers

People subscribed via source and target branches