Merge lp:~cjohnston/charm-helpers/1324045 into lp:charm-helpers

Proposed by Chris Johnston
Status: Merged
Merged at revision: 154
Proposed branch: lp:~cjohnston/charm-helpers/1324045
Merge into: lp:charm-helpers
Diff against target: 19 lines (+2/-2)
1 file modified
test_requirements.txt (+2/-2)
To merge this branch: bzr merge lp:~cjohnston/charm-helpers/1324045
Reviewer Review Type Date Requested Status
Michael Nelson Approve
Review via email: mp+221198@code.launchpad.net

Commit message

Update test requirements to have the actual required package versions

Description of the change

tests_requirements.txt lists the nose requirement as 1.1.2 but when running make test it complains that 1.3.1 is needed. That should be fixed.

Also moved the Note about needing an extra package up to the setup instructions so that it is actually noticed.

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

Looks good, I'll just s/This is/python-apt is/ and land.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test_requirements.txt'
2--- test_requirements.txt 2014-04-23 14:42:54 +0000
3+++ test_requirements.txt 2014-05-28 10:01:30 +0000
4@@ -4,13 +4,13 @@
5 # $ virtualenv .env
6 # $ . .env/bin/activate
7 # $ pip install -r test_requirements.txt
8+# NOTE: This is compiled and will require libapt-pkg-dev for headers.
9 # Then `make test` should find all its dependencies.
10 coverage==3.6
11 launchpadlib==1.10.2
12 mock==1.0.1
13-nose==1.1.2
14+nose==1.3.1
15 PyYAML==3.10
16-# Note: This is compiled and will require libapt-pkg-dev for headers.
17 python-apt
18 simplejson==3.3.0
19 testtools

Subscribers

People subscribed via source and target branches