Only warn deprecation when relevant (#68)

* Only warn deprecation when relevant

* Bump version v7.0.1 -> v7.0.2

Author: mmwinther

generated/python/datadoc_model/datadoc_model/__init__.py

@@ -1,7 +1,6 @@
 from . import (
     all_optional,
-    model,  # For backwards compatibility
     required,
 )
 
-__all__ = ["model", "all_optional", "required"]
+__all__ = ["all_optional", "required"]

generated/python/datadoc_model/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssb-datadoc-model"
-version = "7.0.1"
+version = "7.0.2"
 description = "Data Model for use in Statistics Norway's Metadata system"
 authors = [{ name = "Statistics Norway", email = "metadata@ssb.no" }]
 license = "MIT"

generated/python/datadoc_model/tests/test_datadoc_model_all_optional.py

@@ -1,9 +1,10 @@
 import pytest
-from datadoc_model.model import (
+from pydantic import ValidationError
+
+from datadoc_model.all_optional.model import (
     DatadocMetadata,
     MetadataContainer,
 )
-from pydantic import ValidationError
 
 
 def test_instantiate_no_values_container():

…atadoc_model/tests/test_datadoc_model.py …l/tests/test_deprecated_datadoc_model.pygenerated/python/datadoc_model/tests/test_datadoc_model.py renamed to generated/python/datadoc_model/tests/test_deprecated_datadoc_model.py generated/python/datadoc_model/tests/test_datadoc_model.py renamed to generated/python/datadoc_model/tests/test_deprecated_datadoc_model.py

@@ -1,10 +1,15 @@
+"""These tests go against the original import path which is now deprecated
+and should be removed in the next major release.
+
+Potentially some of the tests can be retained and moved to other test modules
+if they still provide value.
+"""
+
 import pytest
-from datadoc_model.model import (
-    DatadocMetadata,
-    MetadataContainer
-)
 from pydantic import ValidationError
 
+from datadoc_model.model import DatadocMetadata, MetadataContainer
+
 
 def test_instantiate_no_values_container():
     container = MetadataContainer()

generated/python/datadoc_model/tests/test_deprecation_warning.py

@@ -0,0 +1,23 @@
+import importlib
+
+import pytest
+
+import datadoc_model.all_optional  # noqa: F401
+import datadoc_model.model
+import datadoc_model.required  # noqa: F401
+
+
+def test_import_deprecated_module():
+    with pytest.warns(DeprecationWarning):
+        importlib.reload(datadoc_model.model)
+
+
+def test_import_all_optional_module(recwarn):
+    importlib.reload(datadoc_model.all_optional)
+
+    assert len(recwarn) == 0
+
+
+def test_import_required_module(recwarn):
+    importlib.reload(datadoc_model.required)
+    assert len(recwarn) == 0