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
=== modified file 'NEWS.rst'
--- NEWS.rst 2021-09-13 15:55:39 +0000
+++ NEWS.rst 2021-10-15 08:49:47 +0000
@@ -2,6 +2,11 @@
2NEWS for launchpadlib2NEWS for launchpadlib
3=====================3=====================
44
51.10.15
6=======
7- Move dependencies of launchpadlib.testing to a new ``testing`` extra.
8 [bug=1019700]
9
51.10.14 (2021-09-13)101.10.14 (2021-09-13)
6====================11====================
7- Adjust versioning strategy to avoid importing pkg_resources, which is slow12- Adjust versioning strategy to avoid importing pkg_resources, which is slow
813
=== modified file 'setup.py'
--- setup.py 2021-09-13 09:42:57 +0000
+++ setup.py 2021-10-15 08:49:47 +0000
@@ -44,10 +44,7 @@
44 'keyring',44 'keyring',
45 'lazr.restfulclient>=0.9.19',45 'lazr.restfulclient>=0.9.19',
46 'lazr.uri',46 'lazr.uri',
47 'setuptools',
48 'six',47 'six',
49 'testresources',
50 'wadllib',
51 ]48 ]
52if sys.version < "2.6":49if sys.version < "2.6":
53 install_requires.append('simplejson')50 install_requires.append('simplejson')
@@ -87,6 +84,12 @@
87 ],84 ],
88 extras_require={85 extras_require={
89 'docs': ['Sphinx'],86 'docs': ['Sphinx'],
87 # Dependencies useful when testing other packages with launchpadlib.
88 'testing': [
89 'testresources',
90 'wadllib',
91 ],
92 # Dependencies only needed by launchpadlib's own tests.
90 'test': ['mock; python_version < "3"'],93 'test': ['mock; python_version < "3"'],
91 },94 },
92 test_suite='launchpadlib.tests',95 test_suite='launchpadlib.tests',
9396
=== modified file 'tox.ini'
--- tox.ini 2020-04-19 09:29:20 +0000
+++ tox.ini 2021-10-15 08:49:47 +0000
@@ -6,7 +6,7 @@
6commands =6commands =
7 zope-testrunner --test-path src --tests-pattern ^tests {posargs}7 zope-testrunner --test-path src --tests-pattern ^tests {posargs}
8deps =8deps =
9 .[test]9 .[testing,test]
10 zope.testrunner10 zope.testrunner
1111
12[testenv:docs]12[testenv:docs]

Subscribers

People subscribed via source and target branches