diff --git a/CHANGELOG.md b/CHANGELOG.md index e5074a7..62d0d8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Changed - **Breaking**: Move monkeypatching from Django app's `ready()` method to dedicated function. Instead of just adding the app to `INSTALLED_APPS`, you now need to explicitly call `django_lazy_gdal.monkeypatch()` at the top of your settings file. +- **Internal**: Renamed lazy GDAL library loading module from `lazy_libgdal` to `libgdal`. ## [0.1.0] diff --git a/src/django_lazy_gdal/__init__.py b/src/django_lazy_gdal/__init__.py index 4062c64..654be3f 100644 --- a/src/django_lazy_gdal/__init__.py +++ b/src/django_lazy_gdal/__init__.py @@ -25,7 +25,7 @@ def monkeypatch() -> None: return _patching_done = True - from django_lazy_gdal import lazy_libgdal + from django_lazy_gdal import libgdal as lazy_libgdal django_libgdal_mod = "django.contrib.gis.gdal.libgdal" lazy_libgdal_mod = "django_lazy_gdal.lazy_libgdal" diff --git a/src/django_lazy_gdal/lazy_libgdal.py b/src/django_lazy_gdal/libgdal.py similarity index 100% rename from src/django_lazy_gdal/lazy_libgdal.py rename to src/django_lazy_gdal/libgdal.py diff --git a/tests/test_lazy_libgdal.py b/tests/test_lazy_libgdal.py index efe6cbd..2b24483 100644 --- a/tests/test_lazy_libgdal.py +++ b/tests/test_lazy_libgdal.py @@ -12,7 +12,7 @@ # Testing for the lazy loading of the GDAL library - whether or not GDAL # is installed - verifying that: # -# - The GDAL library is not loaded upon importing `django_lazy_gdal.lazy_libgdal`. +# - The GDAL library is not loaded upon importing `django_lazy_gdal.libgdal`. # - The library is loaded only once upon the first access to an attribute # of the lazy object. # - Subsequent accesses do not reload the library. @@ -27,13 +27,13 @@ @pytest.fixture(autouse=True) def setup(): - if "django_lazy_gdal.lazy_libgdal" in sys.modules: - del sys.modules["django_lazy_gdal.lazy_libgdal"] + if "django_lazy_gdal.libgdal" in sys.modules: + del sys.modules["django_lazy_gdal.libgdal"] yield def test_lgdal_not_loaded_on_import(): - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal assert isinstance(lazy_libgdal.lgdal, SimpleLazyObject) assert hasattr(lazy_libgdal.lgdal, "_wrapped") @@ -42,7 +42,7 @@ def test_lgdal_not_loaded_on_import(): @pytest.mark.skipif(os.name != "nt", reason="lwingdal is Windows-specific") def test_lwingdal_not_loaded_on_import(): - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal assert isinstance(lazy_libgdal.lwingdal, SimpleLazyObject) assert hasattr(lazy_libgdal.lwingdal, "_wrapped") @@ -50,7 +50,7 @@ def test_lwingdal_not_loaded_on_import(): def test_lgdal_loaded_on_first_access(): - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal assert lazy_libgdal.lgdal._wrapped is empty @@ -66,7 +66,7 @@ def test_lgdal_loaded_on_first_access(): @pytest.mark.skipif(os.name != "nt", reason="lwingdal is Windows-specific") def test_lwingdal_loaded_on_first_access(): - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal assert lazy_libgdal.lwingdal._wrapped is empty @@ -81,7 +81,7 @@ def test_lwingdal_loaded_on_first_access(): def test_lgdal_load_is_cached(): - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal assert lazy_libgdal.lgdal._wrapped is empty @@ -105,7 +105,7 @@ def test_lgdal_load_is_cached(): @pytest.mark.skipif(os.name != "nt", reason="lwingdal is Windows-specific") def test_lwingdal_load_is_cached(): - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal assert lazy_libgdal.lwingdal._wrapped is empty @@ -131,7 +131,7 @@ def test_lwingdal_load_is_cached(): def test_load_gdal_failure(mock_find_library): mock_find_library.return_value = None - import django_lazy_gdal.lazy_libgdal as lazy_libgdal + import django_lazy_gdal.libgdal as lazy_libgdal with pytest.raises(ImproperlyConfigured, match="Could not find the GDAL library"): lazy_libgdal.lgdal.some_attribute diff --git a/tests/test_monkeypatch.py b/tests/test_monkeypatch.py index 4f6082c..12c9b14 100644 --- a/tests/test_monkeypatch.py +++ b/tests/test_monkeypatch.py @@ -21,8 +21,8 @@ def setup(): if target_module_name in sys.modules: del sys.modules[target_module_name] - if "django_lazy_gdal.lazy_libgdal" in sys.modules: - del sys.modules["django_lazy_gdal.lazy_libgdal"] + if "django_lazy_gdal.libgdal" in sys.modules: + del sys.modules["django_lazy_gdal.libgdal"] yield @@ -38,7 +38,7 @@ def test_monkeypatch_libgdal(): django_lazy_gdal.monkeypatch() - from django_lazy_gdal import lazy_libgdal + from django_lazy_gdal import libgdal as lazy_libgdal assert sys.modules["django.contrib.gis.gdal.libgdal"] is lazy_libgdal