[Python-modules-commits] [lazr.config] 01/03: Import lazr.config_2.2.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Thu Feb 9 20:23:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository lazr.config.
commit 6bc2c67960549c25a02280bb3c6b228f473b36bb
Author: Barry Warsaw <barry at ubuntu.com>
Date: Thu Feb 9 15:21:38 2017 -0500
Import lazr.config_2.2.orig.tar.gz
---
MANIFEST.in | 2 +-
PKG-INFO | 2 +-
README.rst | 4 +--
conf.py | 2 +-
lazr.config.egg-info/SOURCES.txt | 39 ----------------------
lazr/config/version.txt | 1 -
setup.cfg | 2 +-
setup.py | 6 ++--
.../lazr.config.egg-info}/PKG-INFO | 2 +-
src/lazr.config.egg-info/SOURCES.txt | 39 ++++++++++++++++++++++
.../lazr.config.egg-info}/dependency_links.txt | 0
.../lazr.config.egg-info}/namespace_packages.txt | 0
.../lazr.config.egg-info}/not-zip-safe | 0
.../lazr.config.egg-info}/requires.txt | 1 -
.../lazr.config.egg-info}/top_level.txt | 0
{lazr => src/lazr}/__init__.py | 0
{lazr => src/lazr}/config/__init__.py | 15 +++------
{lazr => src/lazr}/config/_config.py | 0
{lazr => src/lazr}/config/docs/NEWS.rst | 14 ++++++++
{lazr => src/lazr}/config/docs/__init__.py | 0
{lazr => src/lazr}/config/docs/fixture.py | 0
{lazr => src/lazr}/config/docs/usage.rst | 4 +--
{lazr => src/lazr}/config/docs/usage_fixture.py | 0
{lazr => src/lazr}/config/interfaces.py | 0
{lazr => src/lazr}/config/tests/__init__.py | 0
{lazr => src/lazr}/config/tests/test_config.py | 0
.../lazr}/config/tests/testdata/__init__.py | 0
.../tests/testdata/bad-invalid-name-chars.conf | 0
.../config/tests/testdata/bad-invalid-name.conf | 0
.../lazr}/config/tests/testdata/bad-nonascii.conf | 0
.../config/tests/testdata/bad-redefined-key.conf | 0
.../tests/testdata/bad-redefined-section.conf | 0
.../config/tests/testdata/bad-sectionless.conf | 0
{lazr => src/lazr}/config/tests/testdata/base.conf | 0
.../lazr}/config/tests/testdata/local.conf | 0
.../lazr}/config/tests/testdata/master-local.conf | 0
.../lazr}/config/tests/testdata/master.conf | 0
.../lazr}/config/tests/testdata/shared.conf | 0
src/lazr/config/version.txt | 1 +
tox.ini | 9 +++--
40 files changed, 78 insertions(+), 65 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index 8967217..51e85b5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -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
diff --git a/PKG-INFO b/PKG-INFO
index 86a4f74..47ee2f8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: lazr.config
-Version: 2.1
+Version: 2.2
Summary: Create configuration schemas, and process and validate configurations.
Home-page: https://launchpad.net/lazr.config
Author: LAZR Developers
diff --git a/README.rst b/README.rst
index b4b0fd4..92ef20f 100644
--- a/README.rst
+++ b/README.rst
@@ -7,8 +7,8 @@ Contents:
.. toctree::
:maxdepth: 2
- lazr/config/docs/usage
- lazr/config/docs/NEWS
+ src/lazr/config/docs/usage
+ src/lazr/config/docs/NEWS
HACKING
diff --git a/conf.py b/conf.py
index 3c6af12..9b6ebbe 100644
--- a/conf.py
+++ b/conf.py
@@ -49,7 +49,7 @@ copyright = u'2013-2015, LAZR developers'
# 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
diff --git a/lazr.config.egg-info/SOURCES.txt b/lazr.config.egg-info/SOURCES.txt
deleted file mode 100644
index 959d611..0000000
--- a/lazr.config.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-COPYING.txt
-HACKING.rst
-MANIFEST.in
-README.rst
-conf.py
-setup.cfg
-setup.py
-tox.ini
-lazr/__init__.py
-lazr.config.egg-info/PKG-INFO
-lazr.config.egg-info/SOURCES.txt
-lazr.config.egg-info/dependency_links.txt
-lazr.config.egg-info/namespace_packages.txt
-lazr.config.egg-info/not-zip-safe
-lazr.config.egg-info/requires.txt
-lazr.config.egg-info/top_level.txt
-lazr/config/__init__.py
-lazr/config/_config.py
-lazr/config/interfaces.py
-lazr/config/version.txt
-lazr/config/docs/NEWS.rst
-lazr/config/docs/__init__.py
-lazr/config/docs/fixture.py
-lazr/config/docs/usage.rst
-lazr/config/docs/usage_fixture.py
-lazr/config/tests/__init__.py
-lazr/config/tests/test_config.py
-lazr/config/tests/testdata/__init__.py
-lazr/config/tests/testdata/bad-invalid-name-chars.conf
-lazr/config/tests/testdata/bad-invalid-name.conf
-lazr/config/tests/testdata/bad-nonascii.conf
-lazr/config/tests/testdata/bad-redefined-key.conf
-lazr/config/tests/testdata/bad-redefined-section.conf
-lazr/config/tests/testdata/bad-sectionless.conf
-lazr/config/tests/testdata/base.conf
-lazr/config/tests/testdata/local.conf
-lazr/config/tests/testdata/master-local.conf
-lazr/config/tests/testdata/master.conf
-lazr/config/tests/testdata/shared.conf
\ No newline at end of file
diff --git a/lazr/config/version.txt b/lazr/config/version.txt
deleted file mode 100644
index 879b416..0000000
--- a/lazr/config/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.1
diff --git a/setup.cfg b/setup.cfg
index 6f50e66..0b81dcd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,6 +10,6 @@ pdb = 1
[egg_info]
tag_build =
-tag_date = 0
tag_svn_revision = 0
+tag_date = 0
diff --git a/setup.py b/setup.py
index da9fc1f..c76b5b5 100755
--- a/setup.py
+++ b/setup.py
@@ -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 @@ files. The format supports schema validation.
""",
license='LGPL v3',
install_requires=[
- 'nose',
'setuptools',
'zope.interface',
'lazr.delegates',
diff --git a/lazr.config.egg-info/PKG-INFO b/src/lazr.config.egg-info/PKG-INFO
similarity index 98%
rename from lazr.config.egg-info/PKG-INFO
rename to src/lazr.config.egg-info/PKG-INFO
index 86a4f74..47ee2f8 100644
--- a/lazr.config.egg-info/PKG-INFO
+++ b/src/lazr.config.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: lazr.config
-Version: 2.1
+Version: 2.2
Summary: Create configuration schemas, and process and validate configurations.
Home-page: https://launchpad.net/lazr.config
Author: LAZR Developers
diff --git a/src/lazr.config.egg-info/SOURCES.txt b/src/lazr.config.egg-info/SOURCES.txt
new file mode 100644
index 0000000..ae0a998
--- /dev/null
+++ b/src/lazr.config.egg-info/SOURCES.txt
@@ -0,0 +1,39 @@
+COPYING.txt
+HACKING.rst
+MANIFEST.in
+README.rst
+conf.py
+setup.cfg
+setup.py
+tox.ini
+src/lazr/__init__.py
+src/lazr.config.egg-info/PKG-INFO
+src/lazr.config.egg-info/SOURCES.txt
+src/lazr.config.egg-info/dependency_links.txt
+src/lazr.config.egg-info/namespace_packages.txt
+src/lazr.config.egg-info/not-zip-safe
+src/lazr.config.egg-info/requires.txt
+src/lazr.config.egg-info/top_level.txt
+src/lazr/config/__init__.py
+src/lazr/config/_config.py
+src/lazr/config/interfaces.py
+src/lazr/config/version.txt
+src/lazr/config/docs/NEWS.rst
+src/lazr/config/docs/__init__.py
+src/lazr/config/docs/fixture.py
+src/lazr/config/docs/usage.rst
+src/lazr/config/docs/usage_fixture.py
+src/lazr/config/tests/__init__.py
+src/lazr/config/tests/test_config.py
+src/lazr/config/tests/testdata/__init__.py
+src/lazr/config/tests/testdata/bad-invalid-name-chars.conf
+src/lazr/config/tests/testdata/bad-invalid-name.conf
+src/lazr/config/tests/testdata/bad-nonascii.conf
+src/lazr/config/tests/testdata/bad-redefined-key.conf
+src/lazr/config/tests/testdata/bad-redefined-section.conf
+src/lazr/config/tests/testdata/bad-sectionless.conf
+src/lazr/config/tests/testdata/base.conf
+src/lazr/config/tests/testdata/local.conf
+src/lazr/config/tests/testdata/master-local.conf
+src/lazr/config/tests/testdata/master.conf
+src/lazr/config/tests/testdata/shared.conf
\ No newline at end of file
diff --git a/lazr.config.egg-info/dependency_links.txt b/src/lazr.config.egg-info/dependency_links.txt
similarity index 100%
rename from lazr.config.egg-info/dependency_links.txt
rename to src/lazr.config.egg-info/dependency_links.txt
diff --git a/lazr.config.egg-info/namespace_packages.txt b/src/lazr.config.egg-info/namespace_packages.txt
similarity index 100%
rename from lazr.config.egg-info/namespace_packages.txt
rename to src/lazr.config.egg-info/namespace_packages.txt
diff --git a/lazr.config.egg-info/not-zip-safe b/src/lazr.config.egg-info/not-zip-safe
similarity index 100%
rename from lazr.config.egg-info/not-zip-safe
rename to src/lazr.config.egg-info/not-zip-safe
diff --git a/lazr.config.egg-info/requires.txt b/src/lazr.config.egg-info/requires.txt
similarity index 89%
rename from lazr.config.egg-info/requires.txt
rename to src/lazr.config.egg-info/requires.txt
index b8f685e..512a6bd 100644
--- a/lazr.config.egg-info/requires.txt
+++ b/src/lazr.config.egg-info/requires.txt
@@ -1,4 +1,3 @@
-nose
setuptools
zope.interface
lazr.delegates
diff --git a/lazr.config.egg-info/top_level.txt b/src/lazr.config.egg-info/top_level.txt
similarity index 100%
rename from lazr.config.egg-info/top_level.txt
rename to src/lazr.config.egg-info/top_level.txt
diff --git a/lazr/__init__.py b/src/lazr/__init__.py
similarity index 100%
rename from lazr/__init__.py
rename to src/lazr/__init__.py
diff --git a/lazr/config/__init__.py b/src/lazr/config/__init__.py
similarity index 68%
rename from lazr/config/__init__.py
rename to src/lazr/config/__init__.py
index 61f720a..049df33 100644
--- a/lazr/config/__init__.py
+++ b/src/lazr/config/__init__.py
@@ -20,13 +20,8 @@ import pkg_resources
__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__
diff --git a/lazr/config/_config.py b/src/lazr/config/_config.py
similarity index 100%
rename from lazr/config/_config.py
rename to src/lazr/config/_config.py
diff --git a/lazr/config/docs/NEWS.rst b/src/lazr/config/docs/NEWS.rst
similarity index 75%
rename from lazr/config/docs/NEWS.rst
rename to src/lazr/config/docs/NEWS.rst
index d799e6a..35e3810 100644
--- a/lazr/config/docs/NEWS.rst
+++ b/src/lazr/config/docs/NEWS.rst
@@ -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``
diff --git a/lazr/config/docs/__init__.py b/src/lazr/config/docs/__init__.py
similarity index 100%
rename from lazr/config/docs/__init__.py
rename to src/lazr/config/docs/__init__.py
diff --git a/lazr/config/docs/fixture.py b/src/lazr/config/docs/fixture.py
similarity index 100%
rename from lazr/config/docs/fixture.py
rename to src/lazr/config/docs/fixture.py
diff --git a/lazr/config/docs/usage.rst b/src/lazr/config/docs/usage.rst
similarity index 99%
rename from lazr/config/docs/usage.rst
rename to src/lazr/config/docs/usage.rst
index ec5cb10..e566eae 100644
--- a/lazr/config/docs/usage.rst
+++ b/src/lazr/config/docs/usage.rst
@@ -1194,7 +1194,7 @@ colon, otherwise an exception is raised.
>>> 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 @@ Non-log levels cannot be used here.
>>> as_log_level('cheese')
Traceback (most recent call last):
...
- AttributeError: 'module' object has no attribute 'CHEESE'
+ AttributeError: ...
Other Documents
diff --git a/lazr/config/docs/usage_fixture.py b/src/lazr/config/docs/usage_fixture.py
similarity index 100%
rename from lazr/config/docs/usage_fixture.py
rename to src/lazr/config/docs/usage_fixture.py
diff --git a/lazr/config/interfaces.py b/src/lazr/config/interfaces.py
similarity index 100%
rename from lazr/config/interfaces.py
rename to src/lazr/config/interfaces.py
diff --git a/lazr/config/tests/__init__.py b/src/lazr/config/tests/__init__.py
similarity index 100%
rename from lazr/config/tests/__init__.py
rename to src/lazr/config/tests/__init__.py
diff --git a/lazr/config/tests/test_config.py b/src/lazr/config/tests/test_config.py
similarity index 100%
rename from lazr/config/tests/test_config.py
rename to src/lazr/config/tests/test_config.py
diff --git a/lazr/config/tests/testdata/__init__.py b/src/lazr/config/tests/testdata/__init__.py
similarity index 100%
rename from lazr/config/tests/testdata/__init__.py
rename to src/lazr/config/tests/testdata/__init__.py
diff --git a/lazr/config/tests/testdata/bad-invalid-name-chars.conf b/src/lazr/config/tests/testdata/bad-invalid-name-chars.conf
similarity index 100%
rename from lazr/config/tests/testdata/bad-invalid-name-chars.conf
rename to src/lazr/config/tests/testdata/bad-invalid-name-chars.conf
diff --git a/lazr/config/tests/testdata/bad-invalid-name.conf b/src/lazr/config/tests/testdata/bad-invalid-name.conf
similarity index 100%
rename from lazr/config/tests/testdata/bad-invalid-name.conf
rename to src/lazr/config/tests/testdata/bad-invalid-name.conf
diff --git a/lazr/config/tests/testdata/bad-nonascii.conf b/src/lazr/config/tests/testdata/bad-nonascii.conf
similarity index 100%
rename from lazr/config/tests/testdata/bad-nonascii.conf
rename to src/lazr/config/tests/testdata/bad-nonascii.conf
diff --git a/lazr/config/tests/testdata/bad-redefined-key.conf b/src/lazr/config/tests/testdata/bad-redefined-key.conf
similarity index 100%
rename from lazr/config/tests/testdata/bad-redefined-key.conf
rename to src/lazr/config/tests/testdata/bad-redefined-key.conf
diff --git a/lazr/config/tests/testdata/bad-redefined-section.conf b/src/lazr/config/tests/testdata/bad-redefined-section.conf
similarity index 100%
rename from lazr/config/tests/testdata/bad-redefined-section.conf
rename to src/lazr/config/tests/testdata/bad-redefined-section.conf
diff --git a/lazr/config/tests/testdata/bad-sectionless.conf b/src/lazr/config/tests/testdata/bad-sectionless.conf
similarity index 100%
rename from lazr/config/tests/testdata/bad-sectionless.conf
rename to src/lazr/config/tests/testdata/bad-sectionless.conf
diff --git a/lazr/config/tests/testdata/base.conf b/src/lazr/config/tests/testdata/base.conf
similarity index 100%
rename from lazr/config/tests/testdata/base.conf
rename to src/lazr/config/tests/testdata/base.conf
diff --git a/lazr/config/tests/testdata/local.conf b/src/lazr/config/tests/testdata/local.conf
similarity index 100%
rename from lazr/config/tests/testdata/local.conf
rename to src/lazr/config/tests/testdata/local.conf
diff --git a/lazr/config/tests/testdata/master-local.conf b/src/lazr/config/tests/testdata/master-local.conf
similarity index 100%
rename from lazr/config/tests/testdata/master-local.conf
rename to src/lazr/config/tests/testdata/master-local.conf
diff --git a/lazr/config/tests/testdata/master.conf b/src/lazr/config/tests/testdata/master.conf
similarity index 100%
rename from lazr/config/tests/testdata/master.conf
rename to src/lazr/config/tests/testdata/master.conf
diff --git a/lazr/config/tests/testdata/shared.conf b/src/lazr/config/tests/testdata/shared.conf
similarity index 100%
rename from lazr/config/tests/testdata/shared.conf
rename to src/lazr/config/tests/testdata/shared.conf
diff --git a/src/lazr/config/version.txt b/src/lazr/config/version.txt
new file mode 100644
index 0000000..8bbe6cf
--- /dev/null
+++ b/src/lazr/config/version.txt
@@ -0,0 +1 @@
+2.2
diff --git a/tox.ini b/tox.ini
index 9b0f890..404aa13 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/lazr.config.git
More information about the Python-modules-commits
mailing list