psdi-data-conversion 0.1.2__tar.gz → 0.1.4__tar.gz

{psdi_data_conversion-0.1.2 → psdi_data_conversion-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: psdi_data_conversion
-Version: 0.1.2
+Version: 0.1.4
 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.2 → psdi_data_conversion-0.1.4}/psdi_data_conversion/app.py

@@ -140,33 +140,35 @@ def get_tag_and_sha() -> str:
     ev_tag = os.environ.get(TAG_EV)
     if ev_tag:
         tag = ev_tag
-    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"
+    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 = ""
+        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
     ev_tag_sha = os.environ.get(TAG_SHA_EV)
     if ev_tag_sha:
-        tag: str | None = ev_tag_sha
-    try:
-        cmd = f"git show {tag}" + " | head -n 1 | gawk '{print($2)}'"
+        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 SHA for most recent tag. Error was:\n" + format_exc(),
-              file=sys.stderr)
-        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)