diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ee1776..7141119 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,18 +40,24 @@ jobs: set -vxeuo pipefail # - # Artifacts from https://github.com/nsls2-conda-envs/nsls2-collection/actions/runs/6696329405 + # Artifacts from https://github.com/nsls2-conda-envs/nsls2-collection/actions/runs/6893976610 # - # https://github.com/nsls2-conda-envs/nsls2-collection/suites/17755713829/artifacts/1017093217 - bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection 1017093217 2023-3.2-py310 + # https://github.com/nsls2-conda-envs/nsls2-collection/suites/18255528211/artifacts/1055088073 + bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection 1055088073 2023-3.3-py310 + + # https://github.com/nsls2-conda-envs/nsls2-collection/suites/18255528211/artifacts/1055088080 + bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection 1055088080 2023-3.3-py311 # - # Artifacts from https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/6674274136 + # Artifacts from https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/6893985933 # - # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/suites/17706989798/artifacts/1013563662 - bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1013563662 2023-3.2-py310-tiled + # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/suites/18255550871/artifacts/1055091555 + bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1055091555 2023-3.3-py310-tiled + + # https://github.com/nsls2-conda-envs/nsls2-collection-tiled/suites/18255550871/artifacts/1055091561 + bash ${GITHUB_WORKSPACE}/download-artifacts.sh nsls2-collection-tiled 1055091555 2023-3.3-py311-tiled - name: Upload artifacts to Zenodo run: | diff --git a/test-upload.py b/test-upload.py index 941ea1a..02d75b4 100644 --- a/test-upload.py +++ b/test-upload.py @@ -78,13 +78,13 @@ def create_new_version( notes_urls = [ # non-tiled - "https://github.com/nsls2-conda-envs/nsls2-collection/pull/25", - "https://github.com/nsls2-conda-envs/nsls2-collection/actions/runs/6696329405", + "https://github.com/nsls2-conda-envs/nsls2-collection/pull/26", + "https://github.com/nsls2-conda-envs/nsls2-collection/actions/runs/6893976610", # need this empty line to enforce line break on Zenodo: "", # tiled - "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/pull/24", - "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/6674274136", + "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/pull/25", + "https://github.com/nsls2-conda-envs/nsls2-collection-tiled/actions/runs/6893985933", ] notes_urls_strs = "
\n".join([f'{url}' 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", + "title": f"NSLS-II collection conda environment {version} with Python 3.10 and 3.11", "description": f"NSLS-II collection environment deployed to the experimental floor.

{notes_urls_strs}", "resource_type": {"id": "software"}, "publication_date": datetime.datetime.now().strftime("%Y-%m-%d"), @@ -239,7 +239,7 @@ def update_deposition_with_files(conceptrecid=None, files=None, token=None): if __name__ == "__main__": conceptrecid = "4057062" - version = "2023-3.2" + version = "2023-3.3" token = os.environ["ZENODO_TOKEN"] resp = create_new_version( @@ -273,6 +273,14 @@ def update_deposition_with_files(conceptrecid=None, files=None, token=None): f"runner-{version}-py310.sh": "r", f"{version}-py310.tar.gz": "rb", + # Python 3.11 (non-tiled) + f"{version}-py311-md5sum.txt": "r", + f"{version}-py311-sha256sum.txt": "r", + f"{version}-py311.yml": "r", + f"Dockerfile-{version}-py311": "r", + f"runner-{version}-py311.sh": "r", + f"{version}-py311.tar.gz": "rb", + # # Python 3.8 (tiled) # f"{version}-py38-tiled-md5sum.txt": "r", # f"{version}-py38-tiled-sha256sum.txt": "r", @@ -296,6 +304,14 @@ def update_deposition_with_files(conceptrecid=None, files=None, token=None): 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", }, ) pprint.pprint(resp)