From 50f5baa466c8414251ee021593076150d29e2b87 Mon Sep 17 00:00:00 2001 From: Dave Shawley Date: Fri, 2 Oct 2015 07:27:13 -0400 Subject: [PATCH 1/2] Switch from py_module to sub-package. Distributing py_modules inside of a namespace package seems to violate a namespace packaging requirement. Back to distributing as a package of one file instead :/ --- setup.py | 4 ++-- sprockets/{logging.py => logging/__init__.py} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename sprockets/{logging.py => logging/__init__.py} (100%) diff --git a/setup.py b/setup.py index e6dbfcd..c10e8dd 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ setuptools.setup( license='BSD', extras_require={'tornado': ['tornado>3,<5']}, classifiers=[ - 'Development Status :: 4 - Beta', + 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Natural Language :: English', @@ -36,8 +36,8 @@ setuptools.setup( 'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries :: Python Modules' ], + packages=setuptools.find_packages(), namespace_packages=['sprockets'], - py_modules=['sprockets.logging'], install_requires=install_requires, setup_requires=setup_requires, tests_require=tests_require, diff --git a/sprockets/logging.py b/sprockets/logging/__init__.py similarity index 100% rename from sprockets/logging.py rename to sprockets/logging/__init__.py From 503e404b8bea369d6c3fb983ccf434ee56b83194 Mon Sep 17 00:00:00 2001 From: Dave Shawley Date: Fri, 2 Oct 2015 07:29:51 -0400 Subject: [PATCH 2/2] Version bump to 1.3.2. --- docs/history.rst | 5 +++++ sprockets/logging/__init__.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/history.rst b/docs/history.rst index fa20add..b1e7913 100644 --- a/docs/history.rst +++ b/docs/history.rst @@ -1,6 +1,10 @@ Version History =============== +`1.3.2`_ Oct 2, 2015 +--------------------- +- Switch to packaging as a package instead of a py_module. + `1.3.1`_ Sep 14, 2015 --------------------- - Fix query_arguments handling in Python 3 @@ -36,6 +40,7 @@ Version History --------------------- - Added :class:`sprockets.logging.ContextFilter` +.. _1.3.2: https://github.com/sprockets/sprockets.logging/compare/1.3.1...1.3.2 .. _1.3.1: https://github.com/sprockets/sprockets.logging/compare/1.3.0...1.3.1 .. _1.3.0: https://github.com/sprockets/sprockets.logging/compare/1.2.1...1.3.0 .. _1.2.1: https://github.com/sprockets/sprockets.logging/compare/1.2.0...1.2.1 diff --git a/sprockets/logging/__init__.py b/sprockets/logging/__init__.py index df72f9c..78d31ce 100644 --- a/sprockets/logging/__init__.py +++ b/sprockets/logging/__init__.py @@ -23,7 +23,7 @@ except ImportError: # pragma no cover escape = None log = None -version_info = (1, 3, 1) +version_info = (1, 3, 2) __version__ = '.'.join(str(v) for v in version_info) # Shortcut methods and constants to avoid needing to import logging directly