diff --git a/MANIFEST.in b/MANIFEST.in index d768ea0..7b9c19e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include AUTHORS include LICENSE include README.md -recursive-include utils/templates * +recursive-include shared/utils/templates * diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index e69fdbf..0000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -django<2 -python-dateutil -beautifulsoup4 -translitcodec -# ipdb \ No newline at end of file diff --git a/setup.py b/setup.py index d91cf38..a936914 100644 --- a/setup.py +++ b/setup.py @@ -13,11 +13,11 @@ def read(filename): setup( name='django-shared-utils', - version=__import__('utils').__version__, + version=__import__('shared').__version__, description=' Mix of Python and Django utility functions, classed etc.', long_description=read('README.md'), author='Erik Stein', - author_email='code@classlibrary.net', + author_email='erik@classlibrary.net', url='https://projects.c--y.net/erik/django-shared-utils/', license='MIT License', platforms=['OS Independent'], @@ -25,6 +25,12 @@ setup( exclude=['tests', 'testapp'], ), include_package_data=True, + install_requires=[ + # 'django<2', commented out to make `pip install -U` easier + 'python-dateutil', + 'beautifulsoup4', + 'translitcodec', + ], classifiers=[ 'Development Status :: 5 - Production/Stable', 'Environment :: Web Environment', @@ -48,4 +54,4 @@ setup( # 'pytz', ], # test_suite='testapp.runtests.runtests', -) \ No newline at end of file +) diff --git a/shared/__init__.py b/shared/__init__.py new file mode 100644 index 0000000..1e7aea4 --- /dev/null +++ b/shared/__init__.py @@ -0,0 +1,2 @@ +VERSION = (0, 2, 0) +__version__ = '.'.join(map(str, VERSION)) diff --git a/utils/__init__.py b/shared/utils/__init__.py similarity index 84% rename from utils/__init__.py rename to shared/utils/__init__.py index 7d0a263..9ced646 100644 --- a/utils/__init__.py +++ b/shared/utils/__init__.py @@ -3,10 +3,6 @@ from __future__ import unicode_literals # Erik Stein , 2007-2016 -VERSION = (0, 1, 0) -__version__ = '.'.join(map(str, VERSION)) - - try: from django.utils.translation import ugettext_lazy as _ diff --git a/utils/dateformat.py b/shared/utils/dateformat.py similarity index 100% rename from utils/dateformat.py rename to shared/utils/dateformat.py diff --git a/utils/dates.py b/shared/utils/dates.py similarity index 100% rename from utils/dates.py rename to shared/utils/dates.py diff --git a/utils/fields.py b/shared/utils/fields.py similarity index 100% rename from utils/fields.py rename to shared/utils/fields.py diff --git a/utils/forms.py b/shared/utils/forms.py similarity index 100% rename from utils/forms.py rename to shared/utils/forms.py diff --git a/utils/functional.py b/shared/utils/functional.py similarity index 100% rename from utils/functional.py rename to shared/utils/functional.py diff --git a/utils/locale/__init__.py b/shared/utils/locale/__init__.py similarity index 100% rename from utils/locale/__init__.py rename to shared/utils/locale/__init__.py diff --git a/utils/management/__init__.py b/shared/utils/management/__init__.py similarity index 100% rename from utils/management/__init__.py rename to shared/utils/management/__init__.py diff --git a/utils/management/commands/__init__.py b/shared/utils/management/commands/__init__.py similarity index 100% rename from utils/management/commands/__init__.py rename to shared/utils/management/commands/__init__.py diff --git a/utils/management/commands/fix_proxymodel_permissions.py b/shared/utils/management/commands/fix_proxymodel_permissions.py similarity index 100% rename from utils/management/commands/fix_proxymodel_permissions.py rename to shared/utils/management/commands/fix_proxymodel_permissions.py diff --git a/utils/models/__init__.py b/shared/utils/models/__init__.py similarity index 100% rename from utils/models/__init__.py rename to shared/utils/models/__init__.py diff --git a/utils/models/pages.py b/shared/utils/models/pages.py similarity index 98% rename from utils/models/pages.py rename to shared/utils/models/pages.py index 1f17df3..cdfd036 100644 --- a/utils/models/pages.py +++ b/shared/utils/models/pages.py @@ -7,9 +7,9 @@ from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.utils.text import normalize_newlines from django.utils.translation import ugettext_lazy as _ -from utils.functional import firstof from ..fields import AutoSlugField +from ..functional import firstof # TODO Use translatable fields by default diff --git a/utils/templates/utils/_language_switcher_get.html b/shared/utils/templates/utils/_language_switcher_get.html similarity index 100% rename from utils/templates/utils/_language_switcher_get.html rename to shared/utils/templates/utils/_language_switcher_get.html diff --git a/utils/templates/utils/_language_switcher_post.html b/shared/utils/templates/utils/_language_switcher_post.html similarity index 100% rename from utils/templates/utils/_language_switcher_post.html rename to shared/utils/templates/utils/_language_switcher_post.html diff --git a/utils/templates/utils/_text_list.html b/shared/utils/templates/utils/_text_list.html similarity index 100% rename from utils/templates/utils/_text_list.html rename to shared/utils/templates/utils/_text_list.html diff --git a/utils/templatetags/__init__.py b/shared/utils/templatetags/__init__.py similarity index 100% rename from utils/templatetags/__init__.py rename to shared/utils/templatetags/__init__.py diff --git a/utils/templatetags/daterange.py b/shared/utils/templatetags/daterange.py similarity index 100% rename from utils/templatetags/daterange.py rename to shared/utils/templatetags/daterange.py diff --git a/utils/templatetags/debug_utils.py b/shared/utils/templatetags/debug_utils.py similarity index 100% rename from utils/templatetags/debug_utils.py rename to shared/utils/templatetags/debug_utils.py diff --git a/utils/templatetags/text_tags.py b/shared/utils/templatetags/text_tags.py similarity index 100% rename from utils/templatetags/text_tags.py rename to shared/utils/templatetags/text_tags.py diff --git a/utils/templatetags/translation_tags.py b/shared/utils/templatetags/translation_tags.py similarity index 100% rename from utils/templatetags/translation_tags.py rename to shared/utils/templatetags/translation_tags.py diff --git a/utils/text.py b/shared/utils/text.py similarity index 100% rename from utils/text.py rename to shared/utils/text.py diff --git a/utils/timezone.py b/shared/utils/timezone.py similarity index 100% rename from utils/timezone.py rename to shared/utils/timezone.py diff --git a/utils/translation.py b/shared/utils/translation.py similarity index 100% rename from utils/translation.py rename to shared/utils/translation.py diff --git a/version.py b/version.py deleted file mode 100644 index 0079fc1..0000000 --- a/version.py +++ /dev/null @@ -1,5 +0,0 @@ -from __future__ import unicode_literals - - -VERSION = (0, 1, 0) -__version__ = '.'.join(map(str, VERSION))