psdi-data-conversion 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

psdi_data_conversion/app.py

@@ -30,7 +30,9 @@ from psdi_data_conversion.database import get_format_info
 from psdi_data_conversion.file_io import split_archive_ext
 from psdi_data_conversion.main import print_wrap
 
-# Env var for the SHA of the latest commit
+# Env var for the tag and SHA of the latest commit
+TAG_EV = "TAG"
+TAG_SHA_EV = "TAG_SHA"
 SHA_EV = "SHA"
 
 # Env var for whether this is a production release or development
@@ -134,25 +136,39 @@ def get_tag_and_sha() -> str:
     """Get the SHA of the last commit
     """
 
-    try:
-        # This bash command calls `git tag` to get a sorted list of tags, with the most recent at the top, then uses
-        # `head` to trim it to one line
-        cmd = "git tag --sort -version:refname | head -n 1"
+    # Get the tag of the latest commit
+    ev_tag = os.environ.get(TAG_EV)
+    if ev_tag:
+        tag = ev_tag
+    else:
+        try:
+            # This bash command calls `git tag` to get a sorted list of tags, with the most recent at the top, then uses
+            # `head` to trim it to one line
+            cmd = "git tag --sort -version:refname | head -n 1"
 
-        out_bytes = run(cmd, shell=True, capture_output=True).stdout
-        tag = str(out_bytes.decode()).strip()
+            out_bytes = run(cmd, shell=True, capture_output=True).stdout
+            tag = str(out_bytes.decode()).strip()
+
+        except Exception:
+            print("ERROR: Could not determine most recent tag. Error was:\n" + format_exc(),
+                  file=sys.stderr)
+            tag = ""
 
-        # Get the SHA associated with this tag
-        cmd = f"git show {tag}" + " | head -n 1 | gawk '{print($2)}'"
+    # Get the SHA associated with this tag
+    ev_tag_sha = os.environ.get(TAG_SHA_EV)
+    if ev_tag_sha:
+        tag_sha: str | None = ev_tag_sha
+    else:
+        try:
+            cmd = f"git show {tag}" + " | head -n 1 | gawk '{print($2)}'"
 
-        out_bytes = run(cmd, shell=True, capture_output=True).stdout
-        tag_sha = str(out_bytes.decode()).strip()
+            out_bytes = run(cmd, shell=True, capture_output=True).stdout
+            tag_sha = str(out_bytes.decode()).strip()
 
-    except Exception:
-        print("ERROR: Could not determine most recent tag. Error was:\n" + format_exc(),
-              file=sys.stderr)
-        tag = ""
-        tag_sha = None
+        except Exception:
+            print("ERROR: Could not determine SHA for most recent tag. Error was:\n" + format_exc(),
+                  file=sys.stderr)
+            tag_sha = None
 
     # First check if the SHA is provided through an environmental variable
     ev_sha = os.environ.get(SHA_EV)

{psdi_data_conversion-0.1.1.dist-info → psdi_data_conversion-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psdi_data_conversion
-Version: 0.1.1
+Version: 0.1.3
 Summary: Chemistry file format conversion service, provided by PSDI
 Project-URL: Homepage, https://data-conversion.psdi.ac.uk/
 Project-URL: Documentation, https://psdi-uk.github.io/psdi-data-conversion/

{psdi_data_conversion-0.1.1.dist-info → psdi_data_conversion-0.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 psdi_data_conversion/__init__.py,sha256=urMsTqsTHTch1q4rMT9dgGnrvdPFMP9B8r-6Kr8H5sE,404
-psdi_data_conversion/app.py,sha256=jU0cK3yduKQkDECf1UGJCPpBF57bUitM_YHH0vsoS4A,16745
+psdi_data_conversion/app.py,sha256=RxWkfqoDDNhRH-HlZ3pW_p-EmvIxwDOspwVG5A4SD9I,17254
 psdi_data_conversion/constants.py,sha256=Hq2OVbcSkcv6T87-YJlo1PVlr9ILlB4H3E9JYjzvCF4,7423
 psdi_data_conversion/converter.py,sha256=Y77mqH2OKxf2YelphWDl82AKoRa-APle-l3e8wG_WZA,27315
 psdi_data_conversion/database.py,sha256=XzKvtT-cFmKLWLo5OBB5CV_rGHuqEEuENNyZnbS39qE,56419
@@ -81,8 +81,8 @@ psdi_data_conversion/testing/conversion_callbacks.py,sha256=ATR-_BsYCUN8KyOyUjfd
 psdi_data_conversion/testing/conversion_test_specs.py,sha256=8W97tI6dVbHE9BEW76dsKDlfsm5oTlrlntG--b0h8HU,26106
 psdi_data_conversion/testing/gui.py,sha256=ul7ixYANIzmOG2ZNOZmQO6wsHmGHdiBGAlw-KuoN0j8,19085
 psdi_data_conversion/testing/utils.py,sha256=YrFxjyiIx1seph0j7jCUgAVm6HvXY9QJjx0MvNJRbfw,26134
-psdi_data_conversion-0.1.1.dist-info/METADATA,sha256=M5iHWEennMs8JSqTVqyAKco-9a0a5jRWh6u5W192Ag0,48108
-psdi_data_conversion-0.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-psdi_data_conversion-0.1.1.dist-info/entry_points.txt,sha256=xL7XTzaPRr2E67WhOD1M1Q-76hB8ausQlnNiHzuZQPA,123
-psdi_data_conversion-0.1.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-psdi_data_conversion-0.1.1.dist-info/RECORD,,
+psdi_data_conversion-0.1.3.dist-info/METADATA,sha256=3ny4bgYstqZKmeRZmCu3C9LiHhGuAcE9R4GkKneTl0o,48108
+psdi_data_conversion-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+psdi_data_conversion-0.1.3.dist-info/entry_points.txt,sha256=xL7XTzaPRr2E67WhOD1M1Q-76hB8ausQlnNiHzuZQPA,123
+psdi_data_conversion-0.1.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+psdi_data_conversion-0.1.3.dist-info/RECORD,,