Merge pull request #93 from CarliJoy/chore

Chore: some little fixups

manage.py

@@ -1,21 +1 @@
-#!/usr/bin/env python
-"""Django's command-line utility for administrative tasks."""
-import os
-import sys
-
-
-def main():
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "RoWoOekostromDB.settings")
-    try:
-        from django.core.management import execute_from_command_line
-    except ImportError as exc:
-        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?"
-        ) from exc
-    execute_from_command_line(sys.argv)
-
-
-if __name__ == "__main__":
-    main()
+# This file seems to be required for pytest-django to work properly

src/django_pint/__init__.py

@@ -1,10 +1,4 @@
-import sys
-
-if sys.version_info[:2] >= (3, 8):
-    # TODO: Import directly (no need for conditional) when `python_requires = >= 3.8`
-    from importlib.metadata import PackageNotFoundError, version  # pragma: no cover
-else:
-    from importlib_metadata import PackageNotFoundError, version  # pragma: no cover
+from importlib.metadata import PackageNotFoundError, version
 
 try:
     # Change here if project is renamed and does not equal the package name
@@ -14,3 +8,7 @@
     __version__ = "unknown"
 finally:
     del version, PackageNotFoundError
+
+from quantityfield import fields, helper, settings, units, widgets
+
+__all__ = ["fields", "helper", "settings", "units", "widgets"]

src/quantityfield/__init__.py

@@ -1,12 +1,10 @@
-from pkg_resources import DistributionNotFound, get_distribution
+from importlib.metadata import PackageNotFoundError, version
 
 try:
     # Change here if project is renamed and does not equal the package name
     dist_name = "django-pint"
-    __version__ = get_distribution(dist_name).version
-except DistributionNotFound:  # pragma: no cover
-    # We don't expect this to be executed, as this would mean the configuration
-    # for the python module is wrong
+    __version__ = version(dist_name)
+except PackageNotFoundError:  # pragma: no cover
     __version__ = "unknown"
 finally:
-    del get_distribution, DistributionNotFound
+    del version, PackageNotFoundError

src/quantityfield/fields.py

@@ -12,8 +12,7 @@
 from pint import Quantity
 from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union, cast
 
-from quantityfield.helper import check_matching_unit_dimension
-
+from .helper import check_matching_unit_dimension
 from .units import ureg
 from .widgets import QuantityWidget
 

tests/test_imports.py

@@ -0,0 +1,14 @@
+import django_pint
+import quantityfield
+
+
+def test_version_import_quantityfield() -> None:
+    """The quantityfield version is a defined version"""
+    assert quantityfield.__version__ != "unknown"
+    assert quantityfield.__version__[0].isnumeric()
+
+
+def test_version_import_django_pint() -> None:
+    """The django_pint version is a defined version"""
+    assert django_pint.__version__ != "unknown"
+    assert django_pint.__version__[0].isnumeric()