thds.core 1.32.20250227213248__py3-none-any.whl → 1.32.20250228005722__py3-none-any.whl

thds/core/hashing.py

@@ -74,7 +74,7 @@ def hash_anything(data: SomehowReadable, hasher: T) -> ty.Optional[T]:
         return None
 
 
-def b64(digest: ty.ByteString) -> str:
+def b64(digest: bytes) -> str:
     """The string representation commonly used by Azure utilities.
 
     We use it in cases where we want to represent the same hash that
@@ -88,7 +88,7 @@ def db64(s: str) -> bytes:
     return base64.b64decode(s)
 
 
-def _repr_bytes(bs: ty.ByteString) -> str:
+def _repr_bytes(bs: bytes) -> str:
     return f"db64('{b64(bs)}')"
 
 

thds/core/meta.py

@@ -30,11 +30,14 @@ HIVE_SUB_CHARACTER = "_"
 VERSION_EXCLUSION_REGEX = r"[^\d.]+"
 VERSION_SUB_CHARACTER = ""
 
+CI_TIMESTAMP = "CI_TIMESTAMP"
+CI_USER = "runner"
 DEPLOYING = "DEPLOYING"
 GIT_COMMIT = "GIT_COMMIT"
 GIT_IS_CLEAN = "GIT_IS_CLEAN"
 GIT_IS_DIRTY = "GIT_IS_DIRTY"
 GIT_BRANCH = "GIT_BRANCH"
+MAIN = "main"
 THDS_USER = "THDS_USER"
 
 META_FILE = "meta.json"
@@ -142,6 +145,13 @@ def extract_timestamp(version: str, as_datetime: bool = False):
     )
 
 
+def norm_name(pkg: str) -> str:
+    """Apparently poetry creates slightly different dist-info
+    directories and METADATA files than p-i-p-e-n-v did.
+    """
+    return pkg.replace(".", "_")
+
+
 def _get_pkg_root_filename(pkg: Package) -> str:
     if not isinstance(pkg, str):
         return pkg.__file__ or ""
@@ -162,7 +172,7 @@ def get_version(pkg: Package, orig: str = "") -> str:
         if version_:
             return version_
     try:
-        version_ = version(str(pkg))
+        version_ = version(norm_name(str(pkg)))
     except PackageNotFoundError:
         try:
             version_ = version(str(pkg))
@@ -207,7 +217,7 @@ def get_base_package(pkg: Package) -> str:
         str_pkg = str(pkg)
         if str_pkg == "__main__":
             raise NoBasePackageFromMain(NoBasePackageFromMain.__doc__)
-        _ = version(str_pkg)
+        _ = version(norm_name(str_pkg))
     except PackageNotFoundError:
         try:
             _ = version(str(pkg))

{thds_core-1.32.20250227213248.dist-info → thds_core-1.32.20250228005722.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: thds.core
-Version: 1.32.20250227213248
+Version: 1.32.20250228005722
 Summary: Core utilities.
 Author-email: Trilliant Health <info@trillianthealth.com>
 License: MIT

{thds_core-1.32.20250227213248.dist-info → thds_core-1.32.20250228005722.dist-info}/RECORD

@@ -14,7 +14,7 @@ thds/core/fretry.py,sha256=Tui2q6vXV6c7mjTa1czLrXiugHUEwQp-sZdiwXfxvmM,3829
 thds/core/generators.py,sha256=rcdFpPj0NMJWSaSZTnBfTeZxTTORNB633Lng-BW1284,1939
 thds/core/git.py,sha256=I6kaEvwcvVxCLYHhTTfnHle-GkmgOR9_fHs03QxgBfI,2792
 thds/core/hash_cache.py,sha256=bkdV8HZOl66zNffnIjRvMQH1A0_xNqowMDLBtRXGFl8,3723
-thds/core/hashing.py,sha256=OqaV65vGKpT3l78jm-Uh7xG4DtAczGjk9-Q60OGmhY0,3521
+thds/core/hashing.py,sha256=5I4vLBjgkn9yOXMjBduLGdXsywBob-35qJTk_lks6aw,3505
 thds/core/home.py,sha256=tTClL_AarIKeri1aNCpuIC6evD7qr83ESGD173B81hU,470
 thds/core/hostname.py,sha256=canFGr-JaaG7nUfsQlyL0JT-2tnZoT1BvXzyaOMK1vA,208
 thds/core/imports.py,sha256=0LVegY8I8_XKZPcqiIp2OVVzEDtyqYA3JETf9OAKNKs,568
@@ -24,7 +24,7 @@ thds/core/lazy.py,sha256=e1WvG4LsbEydV0igEr_Vl1cq05zlQNIE8MFYT90yglE,3289
 thds/core/link.py,sha256=kmFJIFvEZc16-7S7IGvtTpzwl3VuvFl3yPlE6WJJ03w,5404
 thds/core/logical_root.py,sha256=gWkIYRv9kNQfzbpxJaYiwNXVz1neZ2NvnvProtOn9d8,1399
 thds/core/merge_args.py,sha256=7oj7dtO1-XVkfTM3aBlq3QlZbo8tb6X7E3EVIR-60t8,5781
-thds/core/meta.py,sha256=5um8Gvl00JFrYdpYfK2qD3pyQEoq-_3T2LXAhFOcTNo,16617
+thds/core/meta.py,sha256=IPLAKrH06HooPMNf5FeqJvUcM-JljTGXddrAQ5oAX8E,16896
 thds/core/parallel.py,sha256=HXAn9aIYqNE5rnRN5ypxR6CUucdfzE5T5rJ_MUv-pFk,7590
 thds/core/pickle_visit.py,sha256=QNMWIi5buvk2zsvx1-D-FKL7tkrFUFDs387vxgGebgU,833
 thds/core/prof.py,sha256=5ViolfPsAPwUTHuhAe-bon7IArPGXydpGoB5uZmObDk,8264
@@ -66,8 +66,8 @@ thds/core/sqlite/structured.py,sha256=swCbDoyVT6cE7Kl79Wh_rg5Z1-yrUDJbiVJF4bjset
 thds/core/sqlite/types.py,sha256=oUkfoKRYNGDPZRk29s09rc9ha3SCk2SKr_K6WKebBFs,1308
 thds/core/sqlite/upsert.py,sha256=BmKK6fsGVedt43iY-Lp7dnAu8aJ1e9CYlPVEQR2pMj4,5827
 thds/core/sqlite/write.py,sha256=z0219vDkQDCnsV0WLvsj94keItr7H4j7Y_evbcoBrWU,3458
-thds_core-1.32.20250227213248.dist-info/METADATA,sha256=QCwyNOPqBZ6moVWE37amntjVEgahhzncnU9KCuWZwB0,2275
-thds_core-1.32.20250227213248.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-thds_core-1.32.20250227213248.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
-thds_core-1.32.20250227213248.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_core-1.32.20250227213248.dist-info/RECORD,,
+thds_core-1.32.20250228005722.dist-info/METADATA,sha256=d3Y1XboRoWpNVvKHLzdLezdzWAIRODxrfwY0Zo-3t-s,2275
+thds_core-1.32.20250228005722.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+thds_core-1.32.20250228005722.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
+thds_core-1.32.20250228005722.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_core-1.32.20250228005722.dist-info/RECORD,,