Merge lp://staging/~barry/lazr.config/tox-fix into lp://staging/lazr.config
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Barry Warsaw | ||||
| Approved revision: | 19 | ||||
| Merged at revision: | 17 | ||||
| Proposed branch: | lp://staging/~barry/lazr.config/tox-fix | ||||
| Merge into: | lp://staging/lazr.config | ||||
| Diff against target: |
161 lines (+36/-22) 9 files modified
MANIFEST.in (+1/-1) README.rst (+2/-2) conf.py (+1/-1) setup.py (+3/-3) src/lazr/config/__init__.py (+5/-10) src/lazr/config/docs/NEWS.rst (+14/-0) src/lazr/config/docs/usage.rst (+2/-2) src/lazr/config/version.txt (+1/-1) tox.ini (+7/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~barry/lazr.config/tox-fix | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix Python 3.6 compatibility, and work around a problem with single-source bilingual namespace packages with dependencies in the same namespace.
Description of the change
2.2 (2017-02-07)
================
- Fix tox import failure related to https:/
(LP: #1662701)
- Don't catch ImportErrors that might occur when importing lazr.config._config
from lazr/config/
ImportErrors of e.g. lazr.delegates.
- setup.py: nose is not an install_requires, so move this dependency to
tox.ini. (LP: #1649726)
- tox.ini: Add the py36 environment and drop py32, py33. Ignore missing
interpreters. Change to a temporary directory when running tox (to avoid
the above tox bug). Invoke nose via -m instead of the mostly deprecated
``python setup.py`` approach.
| Barry Warsaw (barry) wrote | # |
| Colin Watson (cjwatson) | # |
I like this change better.