From a009a0119e24523070086e180fadd11a6847861e Mon Sep 17 00:00:00 2001 From: j Date: Fri, 29 Sep 2017 14:00:57 +0200 Subject: [PATCH] move into shared namespace --- .gitignore | 9 +++++++++ MANIFEST.in | 2 +- setup.py | 5 ++++- shared/__init__.py | 1 + {multilingual => shared/multilingual}/__init__.py | 0 {multilingual => shared/multilingual}/search/__init__.py | 0 .../multilingual}/search/multilingual_xapian_backend.py | 0 {multilingual => shared/multilingual}/utils/__init__.py | 0 {multilingual => shared/multilingual}/utils/fields.py | 0 9 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 shared/__init__.py rename {multilingual => shared/multilingual}/__init__.py (100%) rename {multilingual => shared/multilingual}/search/__init__.py (100%) rename {multilingual => shared/multilingual}/search/multilingual_xapian_backend.py (100%) rename {multilingual => shared/multilingual}/utils/__init__.py (100%) rename {multilingual => shared/multilingual}/utils/fields.py (100%) diff --git a/.gitignore b/.gitignore index e69de29..98e94cd 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,9 @@ +*.py? +*.sw? +*~ +.coverage +.tox +/*.egg-info +build +dist +__pycache__ diff --git a/MANIFEST.in b/MANIFEST.in index 2ded4ae..93bff54 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include AUTHORS include LICENSE include README.md -# recursive-include multilingual/templates * +# recursive-include shared/multilingual/templates * diff --git a/setup.py b/setup.py index 6c8f4f7..6b8b44c 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,8 @@ from io import open import os from setuptools import setup, find_packages +import shared.multilingual + def read(filename): path = os.path.join(os.path.dirname(__file__), filename) @@ -13,7 +15,7 @@ def read(filename): setup( name='django-shared-multilingual', - version=__import__('multilingual').__version__, + version=shared.multilingual.__version__, description=' Collection Django tools for multilingual websites.', long_description=read('README.md'), author='Erik Stein', @@ -24,6 +26,7 @@ setup( packages=find_packages( exclude=['tests', 'tests.*'], ), + namespace_packages=['shared'], include_package_data=True, install_requires=[ # 'Django<2', diff --git a/shared/__init__.py b/shared/__init__.py new file mode 100644 index 0000000..de40ea7 --- /dev/null +++ b/shared/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/multilingual/__init__.py b/shared/multilingual/__init__.py similarity index 100% rename from multilingual/__init__.py rename to shared/multilingual/__init__.py diff --git a/multilingual/search/__init__.py b/shared/multilingual/search/__init__.py similarity index 100% rename from multilingual/search/__init__.py rename to shared/multilingual/search/__init__.py diff --git a/multilingual/search/multilingual_xapian_backend.py b/shared/multilingual/search/multilingual_xapian_backend.py similarity index 100% rename from multilingual/search/multilingual_xapian_backend.py rename to shared/multilingual/search/multilingual_xapian_backend.py diff --git a/multilingual/utils/__init__.py b/shared/multilingual/utils/__init__.py similarity index 100% rename from multilingual/utils/__init__.py rename to shared/multilingual/utils/__init__.py diff --git a/multilingual/utils/fields.py b/shared/multilingual/utils/fields.py similarity index 100% rename from multilingual/utils/fields.py rename to shared/multilingual/utils/fields.py