GJDutils 0.3.4__tar.gz → 0.3.6__tar.gz

{gjdutils-0.3.4 → gjdutils-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GJDutils
-Version: 0.3.4
+Version: 0.3.6
 Summary: A collection of useful utility functions (basics, data science/AI, web development, etc)
 Project-URL: Homepage, https://github.com/gregdetre/gjdutils
 Project-URL: Repository, https://github.com/gregdetre/gjdutils

{gjdutils-0.3.4 → gjdutils-0.3.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 # case-insensitive
 name = "GJDutils"
-version = "0.3.4"
+dynamic = ["version"]
 authors = [
   { name="Greg Detre", email="greg@gregdetre.com" },
 ]
@@ -92,6 +92,9 @@ Repository = "https://github.com/gregdetre/gjdutils"
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.hatch.version]
+path = "src/gjdutils/__version__.py"
+
 [tool.hatch.build.targets.sdist]
 exclude = [
     "dist/",

gjdutils-0.3.6/src/gjdutils/__init__.py

@@ -0,0 +1,5 @@
+"""
+GJDutils - A collection of useful utility functions
+"""
+
+from gjdutils.__version__ import __version__

gjdutils-0.3.6/src/gjdutils/__version__.py

@@ -0,0 +1,3 @@
+"""Single source of truth for package version."""
+
+__version__ = "0.3.6"

{gjdutils-0.3.4 → gjdutils-0.3.6}/src/gjdutils/pypi_build.py

@@ -12,26 +12,11 @@ from packaging.version import Version
 from importlib.metadata import metadata
 
 from gjdutils.cmd import run_cmd
+from gjdutils import __version__
 
 console = Console()
 
 
-def get_version() -> str:
-    """Get package version from pyproject.toml.
-
-    We read directly from pyproject.toml rather than using Python's packaging machinery
-    because we've had issues with the correct version being accessed in deployment/checking
-    machinery that creates virtualenvs. This provides a more reliable way to access the
-    true version from the source."""
-    with open("pyproject.toml", "rb") as f:
-        data = tomllib.load(f)
-    return data["project"]["version"]
-
-
-# Type for PyPI environment
-PyPIEnv = Literal["test", "prod"]
-
-
 def verify_installation(python_path: Path):
     # Command: python -c "import gjdutils; print(gjdutils.__version__)"
     retcode, installed_version, extra = run_cmd(
@@ -39,7 +24,7 @@ def verify_installation(python_path: Path):
         before_msg="Verify package installation by importing and checking version...",
         fatal_msg="Failed to import gjdutils",
     )
-    expected_version = get_version()
+    expected_version = __version__
     assert (
         installed_version == expected_version
     ), f"Installed version {installed_version} does not match expected version {expected_version}"
@@ -47,6 +32,10 @@ def verify_installation(python_path: Path):
     return installed_version
 
 
+# Type for PyPI environment
+PyPIEnv = Literal["test", "prod"]
+
+
 def check_install_optional_features(python_path: Path, *, from_test_pypi: bool = False):
     """Test installation of optional feature sets."""
     # Get optional dependency groups from package metadata

gjdutils-0.3.4/src/gjdutils/__init__.py

@@ -1,7 +0,0 @@
-"""
-GJDutils - A collection of useful utility functions
-"""
-
-from gjdutils.pypi_build import get_version
-
-__version__ = get_version()