PIPE-1669: revert to the code state before the Git failure test.

The GH remote didn't have all Git tags, therefore the package version parsing failed.

Author: r-xue

.github/workflows/sphinx.yml

@@ -31,33 +31,26 @@ jobs:
       - run: conda list
       - run: conda config --show
       - run: conda env list
-      - run: type -a python
       - name: Pre-Build Setup (os misc. latex, git)
         run: sudo apt-get update -y && sudo apt-get install -y git xvfb imagemagick poppler-utils latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-      - run: type -a git
-      - run: git log
-      - run: git status
-      - run: ls -lrtd .git/*
-      - run: git show-ref --tags -d
-      - run: python pipeline/infrastructure/version.py --full-string
       - name: Pre-build Setup (python/sphinx)
         run: python -m pip install .[docs] && mkdir -p ~/.casa/data
-      # - name: Build HTML
-      #   working-directory: ./docs
-      #   run: make html_docs
-      # - name: Build PDF
-      #   working-directory: ./docs
-      #   run: make latexpdf
-      # - name: Upload artifacts
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: docs-artifact
-      #     path: |
-      #       docs/_build/html/
-      #       docs/_build/latex/taskdocs.pdf
-      # - name: Deploy
-      #   uses: peaceiris/actions-gh-pages@v3
-      #   if: github.ref == 'refs/heads/PIPE-1669-run-dev-pipeline-with-modular-casa6'
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-      #     publish_dir: docs/_build
+      - name: Build HTML
+        working-directory: ./docs
+        run: make html_docs
+      - name: Build PDF
+        working-directory: ./docs
+        run: make latexpdf
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs-artifact
+          path: |
+            docs/_build/html/
+            docs/_build/latex/taskdocs.pdf
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        if: github.ref == 'refs/heads/PIPE-1669-run-dev-pipeline-with-modular-casa6'
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: docs/_build

setup.py

@@ -183,15 +183,13 @@ def run(self):
 
 def _get_git_version() -> str:
 
-    # try:
-    #     ver_from_script = subprocess.check_output([sys.executable, 'pipeline/infrastructure/version.py', '--full-string'],
-    #                                               stderr=subprocess.DEVNULL).decode().strip()
-    # except (FileNotFoundError, subprocess.CalledProcessError):
-    #     # likely the script doesn't exist due to a wrong path or the Git metadata check failed.
-    #     ver_from_script = "0.0.dev0"
-    print(os.getcwd())
-    ver_from_script = subprocess.check_output([sys.executable, 'pipeline/infrastructure/version.py', '--full-string'],
-                                                stderr=subprocess.DEVNULL).decode().strip()
+    try:
+        ver_from_script = subprocess.check_output([sys.executable, 'pipeline/infrastructure/version.py', '--full-string'],
+                                                  stderr=subprocess.DEVNULL).decode().strip()
+    except (FileNotFoundError, subprocess.CalledProcessError):
+        # likely the script doesn't exist due to a wrong path or the Git metadata check failed.
+        ver_from_script = "0.0.dev0"
+
 
     return ver_from_script