Move into src subdir to prevent import path overload.

yourlabs · Oct 20, 2020 · d03a177 · d03a177
1 parent 0754fa6
commit d03a177
Show file tree

Hide file tree

Showing 99 changed files with 27 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,9 +12,10 @@
 build/
 dist/
 *.egg/
+src/cities_light/version.py
 
 # Ignore the downloaded data.
-cities_light/data/
+src/cities_light/data/
 
 # vscode & codespaces
 .vscode/*

diff --git a/setup.py b/setup.py
@@ -12,38 +12,39 @@ def read(fname):
 
 
 setup(
-    name='django-cities-light',
+    name="django-cities-light",
     use_scm_version={
         "version_scheme": "post-release",
-        "write_to": "cities_light/version.py",
+        "write_to": "src/cities_light/version.py",
     },
     setup_requires=["setuptools_scm"],
-    description='Simple alternative to django-cities',
-    author='James Pic,Dominick Rivard,Alexey Evseev',
-    author_email='jamespic@gmail.com, dominick.rivard@gmail.com, myhappydo@gmail.com',
-    url='https://github.com/yourlabs/django-cities-light',
-    packages=find_packages(),
+    description="Simple alternative to django-cities",
+    author="James Pic,Dominick Rivard,Alexey Evseev",
+    author_email="jamespic@gmail.com, dominick.rivard@gmail.com, myhappydo@gmail.com",
+    url="https://github.com/yourlabs/django-cities-light",
+    package_dir={"": "src"},
+    packages=find_packages(where="src"),
     include_package_data=True,
     zip_safe=False,
-    long_description=read('README.rst'),
-    license='MIT',
-    keywords='django cities countries postal codes',
+    long_description=read("README.rst"),
+    license="MIT",
+    keywords="django cities countries postal codes",
     install_requires=[
-        'pytz',
-        'unidecode>=0.04.13',
-        'django-autoslug>=1.9.8',
-        'progressbar2>=3.51.4'
+        "pytz",
+        "unidecode>=0.04.13",
+        "django-autoslug>=1.9.8",
+        "progressbar2>=3.51.4",
     ],
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Web Environment',
-        'Framework :: Django',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3',
-        'Topic :: Internet :: WWW/HTTP',
-        'Topic :: Software Development :: Libraries :: Python Modules',
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Web Environment",
+        "Framework :: Django",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Topic :: Internet :: WWW/HTTP",
+        "Topic :: Software Development :: Libraries :: Python Modules",
     ],
 )
diff --git a/cities_light/__init__.py → src/cities_light/__init__.py b/cities_light/__init__.py → src/cities_light/__init__.py
diff --git a/cities_light/abstract_models.py → src/cities_light/abstract_models.py b/cities_light/abstract_models.py → src/cities_light/abstract_models.py
diff --git a/cities_light/admin.py → src/cities_light/admin.py b/cities_light/admin.py → src/cities_light/admin.py
diff --git a/cities_light/contrib/__init__.py → src/cities_light/contrib/__init__.py b/cities_light/contrib/__init__.py → src/cities_light/contrib/__init__.py
diff --git a/cities_light/contrib/ajax_selects_lookups.py → ...ies_light/contrib/ajax_selects_lookups.py b/cities_light/contrib/ajax_selects_lookups.py → ...ies_light/contrib/ajax_selects_lookups.py
diff --git a/cities_light/contrib/restframework3.py → src/cities_light/contrib/restframework3.py b/cities_light/contrib/restframework3.py → src/cities_light/contrib/restframework3.py
diff --git a/cities_light/downloader.py → src/cities_light/downloader.py b/cities_light/downloader.py → src/cities_light/downloader.py
diff --git a/cities_light/exceptions.py → src/cities_light/exceptions.py b/cities_light/exceptions.py → src/cities_light/exceptions.py
diff --git a/cities_light/forms.py → src/cities_light/forms.py b/cities_light/forms.py → src/cities_light/forms.py
diff --git a/cities_light/geonames.py → src/cities_light/geonames.py b/cities_light/geonames.py → src/cities_light/geonames.py
diff --git a/cities_light/loading.py → src/cities_light/loading.py b/cities_light/loading.py → src/cities_light/loading.py
diff --git a/cities_light/management/__init__.py → src/cities_light/management/__init__.py b/cities_light/management/__init__.py → src/cities_light/management/__init__.py
diff --git a/cities_light/management/commands/__init__.py → ...ies_light/management/commands/__init__.py b/cities_light/management/commands/__init__.py → ...ies_light/management/commands/__init__.py
diff --git a/...light/management/commands/cities_light.py → ...light/management/commands/cities_light.py b/...light/management/commands/cities_light.py → ...light/management/commands/cities_light.py
diff --git a/...agement/commands/cities_light_fixtures.py → ...agement/commands/cities_light_fixtures.py b/...agement/commands/cities_light_fixtures.py → ...agement/commands/cities_light_fixtures.py
diff --git a/cities_light/migrations/0001_initial.py → src/cities_light/migrations/0001_initial.py b/cities_light/migrations/0001_initial.py → src/cities_light/migrations/0001_initial.py
diff --git a/cities_light/migrations/0002_city.py → src/cities_light/migrations/0002_city.py b/cities_light/migrations/0002_city.py → src/cities_light/migrations/0002_city.py
diff --git a/...ght/migrations/0003_auto_20141120_0342.py → ...ght/migrations/0003_auto_20141120_0342.py b/...ght/migrations/0003_auto_20141120_0342.py → ...ght/migrations/0003_auto_20141120_0342.py
diff --git a/..._light/migrations/0004_autoslug_update.py → ..._light/migrations/0004_autoslug_update.py b/..._light/migrations/0004_autoslug_update.py → ..._light/migrations/0004_autoslug_update.py
diff --git a/cities_light/migrations/0005_blank_phone.py → ...ties_light/migrations/0005_blank_phone.py b/cities_light/migrations/0005_blank_phone.py → ...ties_light/migrations/0005_blank_phone.py
diff --git a/...006_compensate_for_0003_bytestring_bug.py → ...006_compensate_for_0003_bytestring_bug.py b/...006_compensate_for_0003_bytestring_bug.py → ...006_compensate_for_0003_bytestring_bug.py
diff --git a/...ions/0007_make_country_name_not_unique.py → ...ions/0007_make_country_name_not_unique.py b/...ions/0007_make_country_name_not_unique.py → ...ions/0007_make_country_name_not_unique.py
diff --git a/...es_light/migrations/0008_city_timezone.py → ...es_light/migrations/0008_city_timezone.py b/...es_light/migrations/0008_city_timezone.py → ...es_light/migrations/0008_city_timezone.py
diff --git a/...es_light/migrations/0009_add_subregion.py → ...es_light/migrations/0009_add_subregion.py b/...es_light/migrations/0009_add_subregion.py → ...es_light/migrations/0009_add_subregion.py
diff --git a/...ght/migrations/0010_auto_20200508_1851.py → ...ght/migrations/0010_auto_20200508_1851.py b/...ght/migrations/0010_auto_20200508_1851.py → ...ght/migrations/0010_auto_20200508_1851.py
diff --git a/cities_light/migrations/__init__.py → src/cities_light/migrations/__init__.py b/cities_light/migrations/__init__.py → src/cities_light/migrations/__init__.py
diff --git a/cities_light/models.py → src/cities_light/models.py b/cities_light/models.py → src/cities_light/models.py
diff --git a/cities_light/receivers.py → src/cities_light/receivers.py b/cities_light/receivers.py → src/cities_light/receivers.py
diff --git a/cities_light/settings.py → src/cities_light/settings.py b/cities_light/settings.py → src/cities_light/settings.py
diff --git a/cities_light/signals.py → src/cities_light/signals.py b/cities_light/signals.py → src/cities_light/signals.py
diff --git a/cities_light/tests/__init__.py → src/cities_light/tests/__init__.py b/cities_light/tests/__init__.py → src/cities_light/tests/__init__.py
diff --git a/cities_light/tests/base.py → src/cities_light/tests/base.py b/cities_light/tests/base.py → src/cities_light/tests/base.py
diff --git a/...ight/tests/fixtures/import/angouleme.json → ...ight/tests/fixtures/import/angouleme.json b/...ight/tests/fixtures/import/angouleme.json → ...ight/tests/fixtures/import/angouleme.json
diff --git a/.../tests/fixtures/import/angouleme_city.txt → .../tests/fixtures/import/angouleme_city.txt b/.../tests/fixtures/import/angouleme_city.txt → .../tests/fixtures/import/angouleme_city.txt
diff --git a/...ts/fixtures/import/angouleme_city_wtz.txt → ...ts/fixtures/import/angouleme_city_wtz.txt b/...ts/fixtures/import/angouleme_city_wtz.txt → ...ts/fixtures/import/angouleme_city_wtz.txt
diff --git a/...sts/fixtures/import/angouleme_country.txt → ...sts/fixtures/import/angouleme_country.txt b/...sts/fixtures/import/angouleme_country.txt → ...sts/fixtures/import/angouleme_country.txt
diff --git a/...ests/fixtures/import/angouleme_region.txt → ...ests/fixtures/import/angouleme_region.txt b/...ests/fixtures/import/angouleme_region.txt → ...ests/fixtures/import/angouleme_region.txt
diff --git a/...s/fixtures/import/angouleme_subregion.txt → ...s/fixtures/import/angouleme_subregion.txt b/...s/fixtures/import/angouleme_subregion.txt → ...s/fixtures/import/angouleme_subregion.txt
diff --git a/...ixtures/import/angouleme_translations.txt → ...ixtures/import/angouleme_translations.txt b/...ixtures/import/angouleme_translations.txt → ...ixtures/import/angouleme_translations.txt
diff --git a/.../tests/fixtures/import/angouleme_wtz.json → .../tests/fixtures/import/angouleme_wtz.json b/.../tests/fixtures/import/angouleme_wtz.json → .../tests/fixtures/import/angouleme_wtz.json
diff --git a/...ts/fixtures/import_zip/angouleme_city.zip → ...ts/fixtures/import_zip/angouleme_city.zip b/...ts/fixtures/import_zip/angouleme_city.zip → ...ts/fixtures/import_zip/angouleme_city.zip
diff --git a/...fixtures/import_zip/angouleme_country.zip → ...fixtures/import_zip/angouleme_country.zip b/...fixtures/import_zip/angouleme_country.zip → ...fixtures/import_zip/angouleme_country.zip
diff --git a/.../fixtures/import_zip/angouleme_region.zip → .../fixtures/import_zip/angouleme_region.zip b/.../fixtures/import_zip/angouleme_region.zip → .../fixtures/import_zip/angouleme_region.zip
diff --git a/...xtures/import_zip/angouleme_subregion.zip → ...xtures/import_zip/angouleme_subregion.zip b/...xtures/import_zip/angouleme_subregion.zip → ...xtures/import_zip/angouleme_subregion.zip
diff --git a/...res/import_zip/angouleme_translations.zip → ...res/import_zip/angouleme_translations.zip b/...res/import_zip/angouleme_translations.zip → ...res/import_zip/angouleme_translations.zip
diff --git a/.../tests/fixtures/unicode/kemerovo_city.txt → .../tests/fixtures/unicode/kemerovo_city.txt b/.../tests/fixtures/unicode/kemerovo_city.txt → .../tests/fixtures/unicode/kemerovo_city.txt
diff --git a/...sts/fixtures/unicode/kemerovo_country.txt → ...sts/fixtures/unicode/kemerovo_country.txt b/...sts/fixtures/unicode/kemerovo_country.txt → ...sts/fixtures/unicode/kemerovo_country.txt
diff --git a/...ests/fixtures/unicode/kemerovo_region.txt → ...ests/fixtures/unicode/kemerovo_region.txt b/...ests/fixtures/unicode/kemerovo_region.txt → ...ests/fixtures/unicode/kemerovo_region.txt
diff --git a/...s/fixtures/unicode/kemerovo_subregion.txt → ...s/fixtures/unicode/kemerovo_subregion.txt b/...s/fixtures/unicode/kemerovo_subregion.txt → ...s/fixtures/unicode/kemerovo_subregion.txt
diff --git a/...ixtures/unicode/kemerovo_translations.txt → ...ixtures/unicode/kemerovo_translations.txt b/...ixtures/unicode/kemerovo_translations.txt → ...ixtures/unicode/kemerovo_translations.txt
diff --git a/..._light/tests/fixtures/update/add_city.txt → ..._light/tests/fixtures/update/add_city.txt b/..._light/tests/fixtures/update/add_city.txt → ..._light/tests/fixtures/update/add_city.txt
diff --git a/...ght/tests/fixtures/update/add_country.txt → ...ght/tests/fixtures/update/add_country.txt b/...ght/tests/fixtures/update/add_country.txt → ...ght/tests/fixtures/update/add_country.txt
diff --git a/...ht/tests/fixtures/update/add_records.json → ...ht/tests/fixtures/update/add_records.json b/...ht/tests/fixtures/update/add_records.json → ...ht/tests/fixtures/update/add_records.json
diff --git a/...ight/tests/fixtures/update/add_region.txt → ...ight/tests/fixtures/update/add_region.txt b/...ight/tests/fixtures/update/add_region.txt → ...ight/tests/fixtures/update/add_region.txt
diff --git a/...t/tests/fixtures/update/add_subregion.txt → ...t/tests/fixtures/update/add_subregion.txt b/...t/tests/fixtures/update/add_subregion.txt → ...t/tests/fixtures/update/add_subregion.txt
diff --git a/...ests/fixtures/update/add_translations.txt → ...ests/fixtures/update/add_translations.txt b/...ests/fixtures/update/add_translations.txt → ...ests/fixtures/update/add_translations.txt
diff --git a/...tests/fixtures/update/change_country.json → ...tests/fixtures/update/change_country.json b/...tests/fixtures/update/change_country.json → ...tests/fixtures/update/change_country.json
diff --git a/.../tests/fixtures/update/change_country.txt → .../tests/fixtures/update/change_country.txt b/.../tests/fixtures/update/change_country.txt → .../tests/fixtures/update/change_country.txt
diff --git a/...t/tests/fixtures/update/change_region.txt → ...t/tests/fixtures/update/change_region.txt b/...t/tests/fixtures/update/change_region.txt → ...t/tests/fixtures/update/change_region.txt
diff --git a/...res/update/change_region_and_country.json → ...res/update/change_region_and_country.json b/...res/update/change_region_and_country.json → ...res/update/change_region_and_country.json
diff --git a/...ests/fixtures/update/change_subregion.txt → ...ests/fixtures/update/change_subregion.txt b/...ests/fixtures/update/change_subregion.txt → ...ests/fixtures/update/change_subregion.txt
diff --git a/...ht/tests/fixtures/update/initial_city.txt → ...ht/tests/fixtures/update/initial_city.txt b/...ht/tests/fixtures/update/initial_city.txt → ...ht/tests/fixtures/update/initial_city.txt
diff --git a/...tests/fixtures/update/initial_country.txt → ...tests/fixtures/update/initial_country.txt b/...tests/fixtures/update/initial_country.txt → ...tests/fixtures/update/initial_country.txt
diff --git a/.../tests/fixtures/update/initial_region.txt → .../tests/fixtures/update/initial_region.txt b/.../tests/fixtures/update/initial_region.txt → .../tests/fixtures/update/initial_region.txt
diff --git a/...sts/fixtures/update/initial_subregion.txt → ...sts/fixtures/update/initial_subregion.txt b/...sts/fixtures/update/initial_subregion.txt → ...sts/fixtures/update/initial_subregion.txt
diff --git a/.../fixtures/update/initial_translations.txt → .../fixtures/update/initial_translations.txt b/.../fixtures/update/initial_translations.txt → .../fixtures/update/initial_translations.txt
diff --git a/...ght/tests/fixtures/update/keep_slugs.json → ...ght/tests/fixtures/update/keep_slugs.json b/...ght/tests/fixtures/update/keep_slugs.json → ...ght/tests/fixtures/update/keep_slugs.json
diff --git a/...light/tests/fixtures/update/noinsert.json → ...light/tests/fixtures/update/noinsert.json b/...light/tests/fixtures/update/noinsert.json → ...light/tests/fixtures/update/noinsert.json
diff --git a/...ght/tests/fixtures/update/remove_city.txt → ...ght/tests/fixtures/update/remove_city.txt b/...ght/tests/fixtures/update/remove_city.txt → ...ght/tests/fixtures/update/remove_city.txt
diff --git a/.../tests/fixtures/update/remove_country.txt → .../tests/fixtures/update/remove_country.txt b/.../tests/fixtures/update/remove_country.txt → .../tests/fixtures/update/remove_country.txt
diff --git a/...s/fixtures/update/remove_initial_city.txt → ...s/fixtures/update/remove_initial_city.txt b/...s/fixtures/update/remove_initial_city.txt → ...s/fixtures/update/remove_initial_city.txt
diff --git a/...ixtures/update/remove_initial_country.txt → ...ixtures/update/remove_initial_country.txt b/...ixtures/update/remove_initial_country.txt → ...ixtures/update/remove_initial_country.txt
diff --git a/...fixtures/update/remove_initial_region.txt → ...fixtures/update/remove_initial_region.txt b/...fixtures/update/remove_initial_region.txt → ...fixtures/update/remove_initial_region.txt
diff --git a/...tures/update/remove_initial_subregion.txt → ...tures/update/remove_initial_subregion.txt b/...tures/update/remove_initial_subregion.txt → ...tures/update/remove_initial_subregion.txt
diff --git a/...es/update/remove_initial_translations.txt → ...es/update/remove_initial_translations.txt b/...es/update/remove_initial_translations.txt → ...es/update/remove_initial_translations.txt
diff --git a/...tests/fixtures/update/remove_records.json → ...tests/fixtures/update/remove_records.json b/...tests/fixtures/update/remove_records.json → ...tests/fixtures/update/remove_records.json
diff --git a/...t/tests/fixtures/update/remove_region.txt → ...t/tests/fixtures/update/remove_region.txt b/...t/tests/fixtures/update/remove_region.txt → ...t/tests/fixtures/update/remove_region.txt
diff --git a/...ests/fixtures/update/remove_subregion.txt → ...ests/fixtures/update/remove_subregion.txt b/...ests/fixtures/update/remove_subregion.txt → ...ests/fixtures/update/remove_subregion.txt
diff --git a/...s/fixtures/update/remove_translations.txt → ...s/fixtures/update/remove_translations.txt b/...s/fixtures/update/remove_translations.txt → ...s/fixtures/update/remove_translations.txt
diff --git a/...ght/tests/fixtures/update/update_city.txt → ...ght/tests/fixtures/update/update_city.txt b/...ght/tests/fixtures/update/update_city.txt → ...ght/tests/fixtures/update/update_city.txt
diff --git a/...tests/fixtures/update/update_city_wtz.txt → ...tests/fixtures/update/update_city_wtz.txt b/...tests/fixtures/update/update_city_wtz.txt → ...tests/fixtures/update/update_city_wtz.txt
diff --git a/.../tests/fixtures/update/update_country.txt → .../tests/fixtures/update/update_country.txt b/.../tests/fixtures/update/update_country.txt → .../tests/fixtures/update/update_country.txt
diff --git a/.../tests/fixtures/update/update_fields.json → .../tests/fixtures/update/update_fields.json b/.../tests/fixtures/update/update_fields.json → .../tests/fixtures/update/update_fields.json
diff --git a/...ts/fixtures/update/update_fields_wtz.json → ...ts/fixtures/update/update_fields_wtz.json b/...ts/fixtures/update/update_fields_wtz.json → ...ts/fixtures/update/update_fields_wtz.json
diff --git a/...t/tests/fixtures/update/update_region.txt → ...t/tests/fixtures/update/update_region.txt b/...t/tests/fixtures/update/update_region.txt → ...t/tests/fixtures/update/update_region.txt
diff --git a/...ests/fixtures/update/update_subregion.txt → ...ests/fixtures/update/update_subregion.txt b/...ests/fixtures/update/update_subregion.txt → ...ests/fixtures/update/update_subregion.txt
diff --git a/...s/fixtures/update/update_translations.txt → ...s/fixtures/update/update_translations.txt b/...s/fixtures/update/update_translations.txt → ...s/fixtures/update/update_translations.txt
diff --git a/cities_light/tests/test_contrib.py → src/cities_light/tests/test_contrib.py b/cities_light/tests/test_contrib.py → src/cities_light/tests/test_contrib.py
diff --git a/cities_light/tests/test_downloader.py → src/cities_light/tests/test_downloader.py b/cities_light/tests/test_downloader.py → src/cities_light/tests/test_downloader.py
diff --git a/cities_light/tests/test_fixtures.py → src/cities_light/tests/test_fixtures.py b/cities_light/tests/test_fixtures.py → src/cities_light/tests/test_fixtures.py
diff --git a/cities_light/tests/test_form.py → src/cities_light/tests/test_form.py b/cities_light/tests/test_form.py → src/cities_light/tests/test_form.py
diff --git a/cities_light/tests/test_import.py → src/cities_light/tests/test_import.py b/cities_light/tests/test_import.py → src/cities_light/tests/test_import.py
diff --git a/cities_light/tests/test_migrations.py → src/cities_light/tests/test_migrations.py b/cities_light/tests/test_migrations.py → src/cities_light/tests/test_migrations.py
diff --git a/cities_light/tests/test_models.py → src/cities_light/tests/test_models.py b/cities_light/tests/test_models.py → src/cities_light/tests/test_models.py
diff --git a/cities_light/tests/test_unicode.py → src/cities_light/tests/test_unicode.py b/cities_light/tests/test_unicode.py → src/cities_light/tests/test_unicode.py
diff --git a/cities_light/tests/test_update.py → src/cities_light/tests/test_update.py b/cities_light/tests/test_update.py → src/cities_light/tests/test_update.py
diff --git a/cities_light/validators.py → src/cities_light/validators.py b/cities_light/validators.py → src/cities_light/validators.py