From 384da1207dc3201a7bb538db11c555538e81b12d Mon Sep 17 00:00:00 2001 From: Jean Jordaan Date: Mon, 28 Sep 2015 17:42:49 +0700 Subject: [PATCH 1/3] Specify namespace packages Without namespace packages, this blocks import of e.g. collecgtive.transcode.recipe --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d7ce509..c0b572b 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ def read(*rnames): return open(os.path.join(os.path.dirname(__file__), *rnames)).read() -version = '0.12' +version = '0.13' long_description = ( read('README.txt') @@ -41,6 +41,7 @@ def read(*rnames): author_email='we@unweb.me', url='https://github.com/plumi/collective.transcode.daemon', license='GPL', + namespace_packages=['collective', 'collective.transcode'], packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), include_package_data=True, zip_safe=False, From 1dc3de75a7dd761354ef5a0d2ac24d571f660e88 Mon Sep 17 00:00:00 2001 From: Jean Jordaan Date: Mon, 28 Sep 2015 17:46:43 +0700 Subject: [PATCH 2/3] Note namespace packages change --- docs/CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 5a4279e..34f20b5 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -2,6 +2,7 @@ ----------------- - Disable directory listing [Gagaro] + - Specify namespace packages [jean] 0.12 (2012-12-03) ----------------- From 78026862b5a99e133d83617d482b5aa035e50f0e Mon Sep 17 00:00:00 2001 From: Jean Jordaan Date: Mon, 28 Sep 2015 17:49:24 +0700 Subject: [PATCH 3/3] Call declare_namespace in __init__ --- collective/__init__.py | 7 ++++++- collective/transcode/__init__.py | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/collective/__init__.py b/collective/__init__.py index 792d600..f48ad10 100644 --- a/collective/__init__.py +++ b/collective/__init__.py @@ -1 +1,6 @@ -# +# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages +try: + __import__('pkg_resources').declare_namespace(__name__) +except ImportError: + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) diff --git a/collective/transcode/__init__.py b/collective/transcode/__init__.py index 792d600..f48ad10 100644 --- a/collective/transcode/__init__.py +++ b/collective/transcode/__init__.py @@ -1 +1,6 @@ -# +# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages +try: + __import__('pkg_resources').declare_namespace(__name__) +except ImportError: + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__)