Merge lp:~barry/lazr.config/tox-fix into lp:lazr.config

[Barry Warsaw]

Fix Python 3.6 compatibility, and work around a problem with single-source bilingual namespace packages with dependencies in the same namespace.

2.2 (2017-02-07)
================
- Fix tox import failure related to https://github.com/tox-dev/tox/issues/453
  (LP: #1662701)
- Don't catch ImportErrors that might occur when importing lazr.config._config
  from lazr/config/__init__.py. It's unnecessary and masks legitimate
  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.

[lp:~barry/lazr.config/tox-fix]

18. By Barry Warsaw on 2017-02-08

Do a better job of isolation from cwd.

* Move the lazr subdirectory into src/
* Don't changedir in tox.ini.
* Add coverage as a dep to tox.ini
* Use python -s and nose -P for isolation.
* Adjust the doctest for compatibility of error strings between Python 2.7,
  3.5, and 3.6
* Add NEWS.

[Barry Warsaw (barry)]

I like this change better.

[Colin Watson (cjwatson)]

review: Approve

[lp:~barry/lazr.config/tox-fix]

19. By Barry Warsaw on 2017-02-09

Fix a couple of other paths.

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2014-08-22 14:21:40 +0000
+++ MANIFEST.in	2017-02-09 15:31:34 +0000
@@ -1,3 +1,3 @@
 include *.py *.txt *.rst MANIFEST.in *.ini
-recursive-include lazr *.txt *.rst *.conf
+recursive-include src/lazr *.txt *.rst *.conf
 exclude .bzrignore

=== modified file 'README.rst'
--- README.rst	2013-01-10 21:39:27 +0000
+++ README.rst	2017-02-09 15:31:34 +0000
@@ -7,8 +7,8 @@
 .. toctree::
    :maxdepth: 2
 
-   lazr/config/docs/usage
-   lazr/config/docs/NEWS
+   src/lazr/config/docs/usage
+   src/lazr/config/docs/NEWS
    HACKING
 
 

=== modified file 'conf.py'
--- conf.py	2015-01-06 00:52:55 +0000
+++ conf.py	2017-02-09 15:31:34 +0000
@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = open('lazr/config/version.txt').read().strip()
+version = open('src/lazr/config/version.txt').read().strip()
 # The full version, including alpha/beta/rc tags.
 release = version
 

=== modified file 'setup.py'
--- setup.py	2015-01-06 00:52:55 +0000
+++ setup.py	2017-02-09 15:31:34 +0000
@@ -16,13 +16,14 @@
 
 from setuptools import setup, find_packages
 
-__version__ = open("lazr/config/version.txt").read().strip()
+__version__ = open("src/lazr/config/version.txt").read().strip()
 
 setup(
     name='lazr.config',
     version=__version__,
     namespace_packages=['lazr'],
-    packages=find_packages(),
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,
     maintainer='LAZR Developers',
@@ -40,7 +41,6 @@
 """,
     license='LGPL v3',
     install_requires=[
-        'nose',
         'setuptools',
         'zope.interface',
         'lazr.delegates',

=== added directory 'src'
=== renamed directory 'lazr' => 'src/lazr'
=== modified file 'src/lazr/config/__init__.py'
--- lazr/config/__init__.py	2015-01-06 00:52:55 +0000
+++ src/lazr/config/__init__.py	2017-02-09 15:31:34 +0000
@@ -20,13 +20,8 @@
 __version__ = pkg_resources.resource_string(
     "lazr.config", "version.txt").strip()
 
-# Re-export in such a way that __version__ can still be imported if
-# dependencies are not yet available.
-try:
-    # While we generally frown on "*" imports, this, combined with the fact we
-    # only test code from this module, means that we can verify what has been
-    # exported.
-    from lazr.config._config import *
-    from lazr.config._config import __all__
-except ImportError:
-    pass
+# While we generally frown on "*" imports, this, combined with the fact we
+# only test code from this module, means that we can verify what has been
+# exported.
+from lazr.config._config import *
+from lazr.config._config import __all__

=== modified file 'src/lazr/config/docs/NEWS.rst'
--- lazr/config/docs/NEWS.rst	2015-01-06 01:58:53 +0000
+++ src/lazr/config/docs/NEWS.rst	2017-02-09 15:31:34 +0000
@@ -2,6 +2,20 @@
 NEWS for lazr.config
 ====================
 
+2.2 (2017-02-07)
+================
+- Fix tox import failure related to https://github.com/tox-dev/tox/issues/453
+  (LP: #1662701)
+- Don't catch ImportErrors that might occur when importing lazr.config._config
+  from lazr/config/__init__.py.  It's unnecessary and masks legitimate
+  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.
+
 2.1 (2015-01-05)
 ================
 - Always use old-style namespace package registration in ``lazr/__init__.py``

=== modified file 'src/lazr/config/docs/usage.rst'
--- lazr/config/docs/usage.rst	2015-01-06 02:02:23 +0000
+++ src/lazr/config/docs/usage.rst	2017-02-09 15:31:34 +0000
@@ -1194,7 +1194,7 @@
     >>> as_username_groupname('foo')
     Traceback (most recent call last):
     ...
-    ValueError: need more than 1 value to unpack
+    ValueError: ...
 
 When both are given, the strings are returned unchanged or validated.
 
@@ -1328,7 +1328,7 @@
     >>> as_log_level('cheese')
     Traceback (most recent call last):
     ...
-    AttributeError: 'module' object has no attribute 'CHEESE'
+    AttributeError: ...
 
 
 Other Documents

=== modified file 'src/lazr/config/version.txt'
--- lazr/config/version.txt	2015-01-06 00:52:55 +0000
+++ src/lazr/config/version.txt	2017-02-09 15:31:34 +0000
@@ -1,1 +1,1 @@
-2.1
+2.2

=== modified file 'tox.ini'
--- tox.ini	2014-08-22 14:21:16 +0000
+++ tox.ini	2017-02-09 15:31:34 +0000
@@ -1,5 +1,10 @@
 [tox]
-envlist = py27,py32,py33,py34
+envlist = py27,py34,py35,py36
+skip_missing_interpreters = True
+
 
 [testenv]
-commands = python setup.py nosetests
+commands = python -s -m nose -P lazr
+deps =
+     nose
+     coverage