Merge pull request #15 from nsls2-conda-envs/2024-2.1

2024-2.1 conda envs
nsls2-conda-envs · Jun 21, 2024 · 8ce0b4e · 8ce0b4e
2 parents 28c31c9 + 68f9a71
commit 8ce0b4e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/upload-artifacts.yml b/.github/workflows/upload-artifacts.yml
@@ -50,14 +50,17 @@ jobs:
           # bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection 1184244622 2024-1.0-py311
 
           #
-          # Artifacts from https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/8973247394
+          # Artifacts from https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/9615874852
           #
 
-          # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/8973247394/artifacts/1477366915
-          bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1477366915 2024-1.0-py310-tiled
+          # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/9615874852/artifacts/1625317555
+          bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1625317555 2024-2.1-py310-tiled
 
-          # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/8973247394/artifacts/1477371389
-          bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1477371389 2024-1.0-py311-tiled
+          # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/9615874852/artifacts/1625326776
+          bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1625326776 2024-2.1-py311-tiled
+
+          # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/9615874852/artifacts/1625315849
+          bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1625315849 2024-2.1-py312-tiled
 
       - name: Upload artifacts to Zenodo
         run: |

diff --git a/upload-artifacts.py b/upload-artifacts.py
@@ -83,8 +83,8 @@ def create_new_version(
         # # need this empty line to enforce line break on Zenodo:
         # "",
         # tiled
-        "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/pull/29",
-        "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/8973247394",
+        "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/pull/37",
+        "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/9615874852",
     ]
     notes_urls_strs = "<br>\n".join([f'<a href="{url}">{url}</a>'
                                      if url else ""
@@ -105,7 +105,7 @@ def create_new_version(
     data = {
         "metadata": {
             "version": version,
-            "title": f"NSLS-II collection conda environment {version} with Python 3.10 and 3.11",
+            "title": f"NSLS-II collection conda environment {version} with Python 3.10, 3.11, and 3.12",
             "description": f"NSLS-II collection environment deployed to the experimental floor.<br><br>{notes_urls_strs}",
             "resource_type": {"id": "software"},
             "publication_date": datetime.datetime.now().strftime("%Y-%m-%d"),
@@ -238,8 +238,8 @@ def update_deposition_with_files(conceptrecid=None, files=None, token=None):
 
 if __name__ == "__main__":
 
-    conceptrecid = "4057062"
-    version = "2024-2.0"
+    conceptrecid = "4057062"  # never changes, it's for the initial version.
+    version = "2024-2.1"
     token = os.environ["ZENODO_TOKEN"]
 
     resp = create_new_version(
@@ -301,17 +301,19 @@ def update_deposition_with_files(conceptrecid=None, files=None, token=None):
             f"{version}-py310-tiled-md5sum.txt": "r",
             f"{version}-py310-tiled-sha256sum.txt": "r",
             f"{version}-py310-tiled.yml": "r",
-            # f"Dockerfile-{version}-py310-tiled": "r",
-            # f"runner-{version}-py310-tiled.sh": "r",
             f"{version}-py310-tiled.tar.gz": "rb",
 
             # Python 3.11 (tiled)
             f"{version}-py311-tiled-md5sum.txt": "r",
             f"{version}-py311-tiled-sha256sum.txt": "r",
             f"{version}-py311-tiled.yml": "r",
-            # f"Dockerfile-{version}-py311-tiled": "r",
-            # f"runner-{version}-py311-tiled.sh": "r",
             f"{version}-py311-tiled.tar.gz": "rb",
+
+            # Python 3.12 (tiled)
+            f"{version}-py312-tiled-md5sum.txt": "r",
+            f"{version}-py312-tiled-sha256sum.txt": "r",
+            f"{version}-py312-tiled.yml": "r",
+            f"{version}-py312-tiled.tar.gz": "rb",
         },
     )
     pprint.pprint(resp)