change docsteady to pip install - add requiremes .txt

lsst · Jan 8, 2025 · 2f36c1c · 2f36c1c
1 parent dd6262c
commit 2f36c1c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/project_templates/test_report/TESTTR-0/.github/workflows/docgen_from_Jira.yaml b/project_templates/test_report/TESTTR-0/.github/workflows/docgen_from_Jira.yaml
@@ -13,26 +13,20 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.11"
 
       - name: Python install
         run: |
           python -m pip install --upgrade pip
-          python -m pip install "lander<2.0.0"
+          python -m pip install -r requirements.txt
 
-      - name: condaenv
-        run: |
-          conda init bash
-          conda create --name docsteady-env docsteady -c lsst-dm -c conda-forge
-        shell: bash
 
       - name: docugen
         env:
           JIRA_USER: ${{ secrets.JIRA_USER }}
           JIRA_PASSWORD: ${{ secrets.JIRA_PASSWORD }}
           ZEPHYR_TOKEN: ${{ secrets.ZEPHYR_TOKEN }}
         run: |
-          source ${CONDA}/bin/activate docsteady-env
           docsteady  --namespace DM generate-tpr LVV-P73  TESTTR-0.tex
         shell: bash
 

diff --git a/project_templates/test_report/TESTTR-0/Makefile b/project_templates/test_report/TESTTR-0/Makefile
@@ -43,6 +43,8 @@ generate: .FORCE
 
 
 #Traditional acronyms are better in this document
+# remeber to add more TAGS like PMO or CAM to get corect acronyms and preferably
+# do not commit acronyms.tex
 acronyms.tex : ${TEX} myacronyms.txt skipacronyms.txt
 	echo ${TEXMFHOME}
 	python3 ${TEXMFHOME}/../bin/generateAcronyms.py -t "DM"    $(TEX)

diff --git a/project_templates/test_report/TESTTR-0/requirements.txt b/project_templates/test_report/TESTTR-0/requirements.txt
@@ -0,0 +1,4 @@
+pydantic<2.0.0
+lander<2.0.0
+docsteady>=3.0
+
diff --git a/...r.series.upper()}}-{{cookiecutter.serial_number}}/.github/workflows/docgen_from_Jira.yaml b/...r.series.upper()}}-{{cookiecutter.serial_number}}/.github/workflows/docgen_from_Jira.yaml
@@ -13,26 +13,20 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: "3.11"
 
       - name: Python install
         run: |
           python -m pip install --upgrade pip
-          python -m pip install "lander<2.0.0"
+          python -m pip install -r requirements.txt
 
-      - name: condaenv
-        run: |
-          conda init bash
-          conda create --name docsteady-env docsteady -c lsst-dm -c conda-forge
-        shell: bash
 
       - name: docugen
         env:
           JIRA_USER: {% raw %}${{ secrets.JIRA_USER }}{% endraw %}
           JIRA_PASSWORD: {% raw %}${{ secrets.JIRA_PASSWORD }}{% endraw %}
           ZEPHYR_TOKEN: {% raw %}${{ secrets.ZEPHYR_TOKEN }}{% endraw %}
         run: |
-          source ${CONDA}/bin/activate docsteady-env
           docsteady  --namespace {{ cookiecutter.namespace }} generate-tpr {{ cookiecutter.plan }}  {{ cookiecutter.series }}-{{ cookiecutter.serial_number }}.tex
         shell: bash
 

diff --git a/...lates/test_report/{{cookiecutter.series.upper()}}-{{cookiecutter.serial_number}}/Makefile b/...lates/test_report/{{cookiecutter.series.upper()}}-{{cookiecutter.serial_number}}/Makefile
@@ -43,6 +43,8 @@ generate: .FORCE
 
 
 #Traditional acronyms are better in this document
+# remeber to add more TAGS like PMO or CAM to get corect acronyms and preferably
+# do not commit acronyms.tex
 acronyms.tex : ${TEX} myacronyms.txt skipacronyms.txt
 	echo ${TEXMFHOME}
 	python3 ${TEXMFHOME}/../bin/generateAcronyms.py -t "DM"    $(TEX)

diff --git a/...st_report/{{cookiecutter.series.upper()}}-{{cookiecutter.serial_number}}/requirements.txt b/...st_report/{{cookiecutter.series.upper()}}-{{cookiecutter.serial_number}}/requirements.txt
@@ -0,0 +1,4 @@
+pydantic<2.0.0
+lander<2.0.0
+docsteady>=3.0
+