ruff validation

src/cities_light/__init__.py

@@ -2,14 +2,14 @@
     region_items_pre_import, region_items_post_import, \
     subregion_items_pre_import, subregion_items_post_import, \
     city_items_pre_import, city_items_post_import, \
-    translation_items_pre_import
-from .exceptions import CitiesLightException, InvalidItems, SourceFileDoesNotExist
+    translation_items_pre_import  # noqa: F401
+from .exceptions import CitiesLightException, InvalidItems, SourceFileDoesNotExist   # noqa: F401
 from .settings import FIXTURES_BASE_URL, COUNTRY_SOURCES, REGION_SOURCES, \
     SUBREGION_SOURCES, CITY_SOURCES, TRANSLATION_LANGUAGES, \
     TRANSLATION_SOURCES, SOURCES, DATA_DIR, INDEX_SEARCH_NAMES, \
     INCLUDE_COUNTRIES, INCLUDE_CITY_TYPES, DEFAULT_APP_NAME, \
     CITIES_LIGHT_APP_NAME, ICountry, IRegion, ISubRegion, ICity, \
-    IAlternate
+    IAlternate   # noqa: F401
 from . import version
 
 __version__ = version.version

src/cities_light/geonames.py

@@ -2,7 +2,7 @@
 import zipfile
 import logging
 
-from .settings import *
+from .settings import DATA_DIR
 from .downloader import Downloader
 
 

src/cities_light/management/commands/cities_light.py

@@ -9,10 +9,7 @@
 if sys.platform != 'win32':
     import resource
 
-try:
-    import cPickle as pickle
-except ImportError:
-    import pickle
+import pickle
 
 from django.conf import settings
 from django.db import transaction, connection
@@ -22,9 +19,19 @@
 
 import progressbar
 
-from ...exceptions import *
-from ...signals import *
-from ...settings import *
+from ...settings import (
+    COUNTRY_SOURCES, REGION_SOURCES, SUBREGION_SOURCES, CITY_SOURCES,
+    TRANSLATION_SOURCES, DATA_DIR, TRANSLATION_LANGUAGES
+)
+from ...models import ICountry, IRegion, ISubRegion, ICity, IAlternate
+from ...signals import (
+    country_items_pre_import, region_items_pre_import,
+    subregion_items_pre_import, city_items_pre_import,
+    translation_items_pre_import, country_items_post_import,
+    region_items_post_import, subregion_items_post_import,
+    city_items_post_import
+)
+from ...exceptions import InvalidItems
 from ...geonames import Geonames
 from ...loading import get_cities_models
 from ...validators import timezone_validator

src/cities_light/models.py

@@ -85,15 +85,10 @@ def set_city_fields(sender, instance, items, **kwargs):
                               CONTINENT_CHOICES,
                               to_search, to_ascii)
 
-from .signals import *
-from .receivers import *
-from .settings import *
-
-__all__ = ['CONTINENT_CHOICES', 'to_search', 'to_ascii', 'filter_non_cities',
-           'filter_non_included_countries_country',
-           'filter_non_included_countries_region',
-           'filter_non_included_countries_subregion',
-           'filter_non_included_countries_city']
+from .receivers import connect_default_signals
+from .settings import CITIES_LIGHT_APP_NAME, DEFAULT_APP_NAME
+
+__all__ = ['CONTINENT_CHOICES', 'to_search', 'to_ascii']
 
 if CITIES_LIGHT_APP_NAME == DEFAULT_APP_NAME:
     class Country(AbstractCountry):

src/cities_light/receivers.py

@@ -1,8 +1,11 @@
 from django.db.models import signals
 from .abstract_models import to_ascii, to_search
-from .settings import *
-from .signals import *
-from .exceptions import *
+from .settings import INCLUDE_CITY_TYPES, INCLUDE_COUNTRIES
+from .signals import (
+    city_items_pre_import, country_items_pre_import, region_items_pre_import,
+    subregion_items_pre_import, InvalidItems,
+)
+
 
 
 def set_name_ascii(sender, instance=None, **kwargs):

src/cities_light/tests/test_migrations.py

@@ -1,19 +1,19 @@
-import unittest
-
 from django import test
 from django.apps import apps
 from django.db.migrations.autodetector import MigrationAutodetector
 from django.db.migrations.loader import MigrationLoader
 from django.db.migrations.questioner import (
     InteractiveMigrationQuestioner, )
 from django.db.migrations.state import ProjectState
+import logging
 
+logger = logging.getLogger(__name__)
 
 class TestNoMigrationLeft(test.TestCase):
-    @unittest.skip("TODO: make the test pass")
     def test_no_migration_left(self):
         loader = MigrationLoader(None, ignore_no_migrations=True)
         conflicts = loader.detect_conflicts()
+        logger.error(conflicts)
         app_labels = ['cities_light']
 
         autodetector = MigrationAutodetector(

test_project/manage.py

@@ -7,16 +7,9 @@
     try:
         from django.core.management import execute_from_command_line
     except ImportError:
-        # The above import may fail for some other reason. Ensure that the
-        # issue is really that Django is missing to avoid masking other
-        # exceptions on Python 2.
-        try:
-            import django
-        except ImportError:
-            raise ImportError(
-                "Couldn't import Django. Are you sure it's installed and "
-                "available on your PYTHONPATH environment variable? Did you "
-                "forget to activate a virtual environment?"
-            )
-        raise
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        )
     execute_from_command_line(sys.argv)