Merge lp:~cjwatson/launchpadlib/testing-requires into lp:launchpadlib

Proposed by Colin Watson
Status: Merged
Merged at revision: 187
Proposed branch: lp:~cjwatson/launchpadlib/testing-requires
Merge into: lp:launchpadlib
Diff against target: 56 lines (+12/-4)
3 files modified
NEWS.rst (+5/-0)
setup.py (+6/-3)
tox.ini (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpadlib/testing-requires
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+410280@code.launchpad.net

Commit message

Move dependencies of launchpadlib.testing to a new 'testing' extra.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.rst'
2--- NEWS.rst 2021-09-13 15:55:39 +0000
3+++ NEWS.rst 2021-10-15 08:49:47 +0000
4@@ -2,6 +2,11 @@
5 NEWS for launchpadlib
6 =====================
7
8+1.10.15
9+=======
10+- Move dependencies of launchpadlib.testing to a new ``testing`` extra.
11+ [bug=1019700]
12+
13 1.10.14 (2021-09-13)
14 ====================
15 - Adjust versioning strategy to avoid importing pkg_resources, which is slow
16
17=== modified file 'setup.py'
18--- setup.py 2021-09-13 09:42:57 +0000
19+++ setup.py 2021-10-15 08:49:47 +0000
20@@ -44,10 +44,7 @@
21 'keyring',
22 'lazr.restfulclient>=0.9.19',
23 'lazr.uri',
24- 'setuptools',
25 'six',
26- 'testresources',
27- 'wadllib',
28 ]
29 if sys.version < "2.6":
30 install_requires.append('simplejson')
31@@ -87,6 +84,12 @@
32 ],
33 extras_require={
34 'docs': ['Sphinx'],
35+ # Dependencies useful when testing other packages with launchpadlib.
36+ 'testing': [
37+ 'testresources',
38+ 'wadllib',
39+ ],
40+ # Dependencies only needed by launchpadlib's own tests.
41 'test': ['mock; python_version < "3"'],
42 },
43 test_suite='launchpadlib.tests',
44
45=== modified file 'tox.ini'
46--- tox.ini 2020-04-19 09:29:20 +0000
47+++ tox.ini 2021-10-15 08:49:47 +0000
48@@ -6,7 +6,7 @@
49 commands =
50 zope-testrunner --test-path src --tests-pattern ^tests {posargs}
51 deps =
52- .[test]
53+ .[testing,test]
54 zope.testrunner
55
56 [testenv:docs]

Subscribers

People subscribed via source and target branches