[Python-modules-commits] [lazr.delegates] 04/07: Import lazr.delegates_2.0.2.orig.tar.gz

Barry Warsaw barry at moszumanska.debian.org
Fri Jan 9 22:25:12 UTC 2015


This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository lazr.delegates.

commit ece251a90e40753382bf4d7156dec1250fa4bf73
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jan 9 17:03:49 2015 -0500

    Import lazr.delegates_2.0.2.orig.tar.gz
---
 PKG-INFO                                 |  2 +-
 conf.py                                  |  2 +-
 lazr.delegates.egg-info/PKG-INFO         |  2 +-
 lazr/__init__.py                         | 20 ++++++++------------
 lazr/delegates/__init__.py               |  2 +-
 lazr/delegates/_delegates.py             |  2 +-
 lazr/delegates/_passthrough.py           |  2 +-
 lazr/delegates/_python2.py               |  2 +-
 lazr/delegates/_python3.py               |  2 +-
 lazr/delegates/docs/NEWS.rst             | 15 ++++++---------
 lazr/delegates/docs/fixture.py           |  2 +-
 lazr/delegates/docs/usage_fixture.py     |  2 +-
 lazr/delegates/tests/test_api.py         |  2 +-
 lazr/delegates/tests/test_passthrough.py |  2 +-
 lazr/delegates/tests/test_python2.py     |  2 +-
 lazr/delegates/version.txt               |  2 +-
 setup.py                                 |  6 +-----
 17 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index a8ab6a8..4a0d363 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lazr.delegates
-Version: 2.0.1
+Version: 2.0.2
 Summary: Easily write objects that delegate behavior
 Home-page: https://launchpad.net/lazr.delegates
 Author: LAZR Developers
diff --git a/conf.py b/conf.py
index 35dfaa0..7722ed2 100644
--- a/conf.py
+++ b/conf.py
@@ -42,7 +42,7 @@ master_doc = 'README'
 
 # General information about the project.
 project = u'lazr.delegates'
-copyright = u'2013-2014, LAZR developers'
+copyright = u'2013-2015, LAZR developers'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/lazr.delegates.egg-info/PKG-INFO b/lazr.delegates.egg-info/PKG-INFO
index a8ab6a8..4a0d363 100644
--- a/lazr.delegates.egg-info/PKG-INFO
+++ b/lazr.delegates.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: lazr.delegates
-Version: 2.0.1
+Version: 2.0.2
 Summary: Easily write objects that delegate behavior
 Home-page: https://launchpad.net/lazr.delegates
 Author: LAZR Developers
diff --git a/lazr/__init__.py b/lazr/__init__.py
index fc8642a..d4073b5 100644
--- a/lazr/__init__.py
+++ b/lazr/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
@@ -14,14 +14,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with lazr.delegates.  If not, see <http://www.gnu.org/licenses/>.
 
-# This is a namespace package, however under >= Python 3.3, let it be a true
-# namespace package (i.e. this cruft isn't necessary).
-import sys
-
-if sys.hexversion < 0x30300f0:
-    try:
-        import pkg_resources
-        pkg_resources.declare_namespace(__name__)
-    except ImportError:
-        import pkgutil
-        __path__ = pkgutil.extend_path(__path__, __name__)
+# This is a namespace package.
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/lazr/delegates/__init__.py b/lazr/delegates/__init__.py
index 88bee95..5601956 100644
--- a/lazr/delegates/__init__.py
+++ b/lazr/delegates/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/_delegates.py b/lazr/delegates/_delegates.py
index 776bfdc..ae09920 100644
--- a/lazr/delegates/_delegates.py
+++ b/lazr/delegates/_delegates.py
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/_passthrough.py b/lazr/delegates/_passthrough.py
index a9f58f3..144f689 100644
--- a/lazr/delegates/_passthrough.py
+++ b/lazr/delegates/_passthrough.py
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/_python2.py b/lazr/delegates/_python2.py
index 12f3545..2ce472a 100644
--- a/lazr/delegates/_python2.py
+++ b/lazr/delegates/_python2.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Canonical Ltd.  All rights reserved.
+# Copyright 2014-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/_python3.py b/lazr/delegates/_python3.py
index ef8b01a..f9430f5 100644
--- a/lazr/delegates/_python3.py
+++ b/lazr/delegates/_python3.py
@@ -1,4 +1,4 @@
-# Copyright 2014 Canonical Ltd.  All rights reserved.
+# Copyright 2014-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/docs/NEWS.rst b/lazr/delegates/docs/NEWS.rst
index affd91b..adbb485 100644
--- a/lazr/delegates/docs/NEWS.rst
+++ b/lazr/delegates/docs/NEWS.rst
@@ -2,41 +2,38 @@
 NEWS for lazr.delegates
 =======================
 
-2.0.1 (2014-08-21)
+2.0.2 (2015-01-05)
 ==================
+- Always use old-style namespace package registration in ``lazr/__init__.py``
+  since the mere presence of this file subverts PEP 420 style namespace
+  packages.  (LP: #1407816)
 
+2.0.1 (2014-08-21)
+==================
 - Drop the use of `distribute` in favor of `setuptools`.  (LP: #1359927)
 - Run the test suite with `tox`.
 
-
 2.0 (2013-01-10)
 ================
-
 - Port to Python 3, which requires the use of the ``@delegate_to`` class
   decorator instead of the ``delegates()`` function call.  Officially support
   Python 2.6, 2.7, 3.2, and 3.3.
 
 1.2.0 (2010-07-16)
 ==================
-
 - Extend Passthrough so that it takes an extra (optional) callable argument,
   used to adapt the context before accessing the delegated attribute.
 
 1.1.0 (2009-08-31)
 ==================
-
 - Remove build dependencies on bzr and egg_info
-
 - remove sys.path hack in setup.py for __version__
 
 1.0.1 (2009-03-24)
 ==================
-
 - specify only v3 of LGPL
-
 - build/developer improvements
 
 1.0 (2008-12-19)
 ================
-
 - Initial release
diff --git a/lazr/delegates/docs/fixture.py b/lazr/delegates/docs/fixture.py
index 39fe56c..1d4aced 100644
--- a/lazr/delegates/docs/fixture.py
+++ b/lazr/delegates/docs/fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates
 #
diff --git a/lazr/delegates/docs/usage_fixture.py b/lazr/delegates/docs/usage_fixture.py
index 2b0d68b..7012cf7 100644
--- a/lazr/delegates/docs/usage_fixture.py
+++ b/lazr/delegates/docs/usage_fixture.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2009-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates
 #
diff --git a/lazr/delegates/tests/test_api.py b/lazr/delegates/tests/test_api.py
index 9dc7a1b..5ecea47 100644
--- a/lazr/delegates/tests/test_api.py
+++ b/lazr/delegates/tests/test_api.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2013-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/tests/test_passthrough.py b/lazr/delegates/tests/test_passthrough.py
index a86af0a..1dceff8 100644
--- a/lazr/delegates/tests/test_passthrough.py
+++ b/lazr/delegates/tests/test_passthrough.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2013-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/tests/test_python2.py b/lazr/delegates/tests/test_python2.py
index 0af4264..1cc873b 100644
--- a/lazr/delegates/tests/test_python2.py
+++ b/lazr/delegates/tests/test_python2.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2013-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
diff --git a/lazr/delegates/version.txt b/lazr/delegates/version.txt
index 38f77a6..e9307ca 100644
--- a/lazr/delegates/version.txt
+++ b/lazr/delegates/version.txt
@@ -1 +1 @@
-2.0.1
+2.0.2
diff --git a/setup.py b/setup.py
index b862f3c..9cdf3c8 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# Copyright 2008-2014 Canonical Ltd.  All rights reserved.
+# Copyright 2008-2015 Canonical Ltd.  All rights reserved.
 #
 # This file is part of lazr.delegates.
 #
@@ -66,8 +66,4 @@ delegating behavior.
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         ],
-    # nose plugins don't really work with `python setup.py test` so use
-    # `python setup.py nosetests` instead, or just `tox`.  Gosh, we really
-    # should switch to nose2. :/  - BAW 2014-08-20
-    #test_suite='nose.collector',
     )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/lazr.delegates.git



More information about the Python-modules-commits mailing list