From a93df877594223e4775dbdae09aebe2d3496c5cb Mon Sep 17 00:00:00 2001 From: Daniel Perrefort Date: Fri, 6 Nov 2026 18:35:34 -0500 Subject: [PATCH 1/3] Updates CI workflows to use upstream BHPC artifact caches --- .github/dependabot.yml | 11 +++++++++++ .github/workflows/Publish.yml | 2 +- .github/workflows/Release.yml | 2 +- .github/workflows/Test.yml | 8 +++++++- pyproject.toml | 9 +++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 040c6a4..cb25c5b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,13 @@ version: 2 + +registries: + bhpc-pypi: + type: python-index + url: https://artifacts.bhpc.dev/pypi/pypi/simple/ + username: ${{secrets.ARTIFACT_REGISTRY_USERNAME}} + password: ${{secrets.ARTIFACT_REGISTRY_PASSWORD}} + replaces-base: true + updates: - package-ecosystem: "github-actions" directory: "/" @@ -11,6 +20,8 @@ updates: - package-ecosystem: "pip" directory: "/" + registries: + - bhpc-pypi schedule: interval: "monthly" groups: diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml index 46343c6..1f8491f 100644 --- a/.github/workflows/Publish.yml +++ b/.github/workflows/Publish.yml @@ -41,7 +41,7 @@ jobs: - name: Publish package run: poetry publish --repository bhpc env: - POETRY_REPOSITORIES_BHPC_URL: https://artifacts.bhpc.dev/pypi/keystone-python/ + POETRY_REPOSITORIES_BHPC_URL: https://artifacts.bhpc.dev/pypi/keystone-python-client/ POETRY_HTTP_BASIC_BHPC_USERNAME: ${{ secrets.ARTIFACT_REGISTRY_USERNAME }} POETRY_HTTP_BASIC_BHPC_PASSWORD: ${{ secrets.ARTIFACT_REGISTRY_PASSWORD }} diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 5ea30a5..491e27f 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -41,7 +41,7 @@ jobs: publish: name: Publish - needs: [ build ] + needs: [ version, build ] uses: ./.github/workflows/Publish.yml secrets: inherit permissions: diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index c382cfb..2ba9817 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -7,6 +7,9 @@ jobs: function-tests: name: Function Tests runs-on: ubuntu-latest + env: + POETRY_HTTP_BASIC_BHPC_PYPI_USERNAME: ${{ secrets.ARTIFACT_REGISTRY_USERNAME }} + POETRY_HTTP_BASIC_BHPC_PYPI_PASSWORD: ${{ secrets.ARTIFACT_REGISTRY_PASSWORD }} services: api: @@ -45,6 +48,9 @@ jobs: unit-tests: name: Unit Tests runs-on: ubuntu-latest + env: + POETRY_HTTP_BASIC_BHPC_PYPI_USERNAME: ${{ secrets.ARTIFACT_REGISTRY_USERNAME }} + POETRY_HTTP_BASIC_BHPC_PYPI_PASSWORD: ${{ secrets.ARTIFACT_REGISTRY_PASSWORD }} strategy: fail-fast: false @@ -96,4 +102,4 @@ jobs: - name: Check test status if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'skipped') || contains(needs.*.result, 'cancelled') }} - run: exit 1 \ No newline at end of file + run: exit 1 diff --git a/pyproject.toml b/pyproject.toml index 8043ee8..7f4ba57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,15 @@ dependencies = [ [project.optional-dependencies] dev = ["coverage==7.15.2", ] +[[tool.poetry.source]] +name = "bhpc-pypi" +url = "https://artifacts.bhpc.dev/pypi/pypi/simple/" +priority = "primary" + +[[tool.poetry.source]] +name = "pypi" +priority = "supplemental" + [tool.poetry] packages = [{ include = "keystone_client" }] From 6573a6f4fdf7adf348a9b1982e3972961d395097 Mon Sep 17 00:00:00 2001 From: Daniel Perrefort Date: Fri, 6 Nov 2026 18:39:24 -0500 Subject: [PATCH 2/3] Updates repo urls to reflect new naming scheme --- .github/workflows/Test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 2ba9817..49956a7 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -13,7 +13,7 @@ jobs: services: api: - image: artifacts.bhpc.dev/keystone-docker/keystone-api:latest + image: artifacts.bhpc.dev/keystone/keystone-api:latest credentials: username: ${{ secrets.ARTIFACT_REGISTRY_USERNAME }} password: ${{ secrets.ARTIFACT_REGISTRY_PASSWORD }} From 9e82d28f551a586c225e50d862c3399d3863638b Mon Sep 17 00:00:00 2001 From: Daniel Perrefort Date: Fri, 6 Nov 2026 18:40:17 -0500 Subject: [PATCH 3/3] Update lock file --- poetry.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/poetry.lock b/poetry.lock index 025031b..b8cfada 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,20 +1,20 @@ -# This file is automatically @generated by Poetry 2.5.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.4.1 and should not be changed by hand. [[package]] name = "anyio" -version = "4.14.2" +version = "4.16.0" description = "High-level concurrency and networking framework on top of asyncio or Trio" optional = false python-versions = ">=3.10" groups = ["main"] files = [ - {file = "anyio-4.14.2-py3-none-any.whl", hash = "sha256:9f505dda5ac9f0c8309b5e8bd445a8c2bf7246f3ce950121e45ea15bc41d1494"}, - {file = "anyio-4.14.2.tar.gz", hash = "sha256:cfa139f3ed1a23ee8f88a145ddb5ac7605b8bbfd8592baacd7ce3d8bb4313c7f"}, + {file = "anyio-4.16.0-py3-none-any.whl", hash = "sha256:c66ae634e0b8228396b801741beb3294326d4b6102f7bba4041c0dfb58c29026"}, + {file = "anyio-4.16.0.tar.gz", hash = "sha256:59bb03251907983d1603d27c3087ddb1e93299ea2163adcdba37899a4fb12ffb"}, ] [package.dependencies] idna = ">=2.8" -typing_extensions = {version = ">=4.5", markers = "python_version < \"3.13\""} +typing_extensions = {version = ">=4.16.0", markers = "python_version < \"3.15\""} [package.extras] trio = ["trio (>=0.32.0)"] @@ -197,14 +197,14 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "idna" -version = "3.19" +version = "3.20" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.9" groups = ["main"] files = [ - {file = "idna-3.19-py3-none-any.whl", hash = "sha256:815e7be7a7806d54abb586dc943addc79e8b2ee16915059658cbeff4b1b43bf4"}, - {file = "idna-3.19.tar.gz", hash = "sha256:5e0811a4383b21dc5838069f801c4fb62113b7447663d2530d2bd6e77b49bf15"}, + {file = "idna-3.20-py3-none-any.whl", hash = "sha256:ab7ae7122974553370f0bdb919e1a960b2cd1bc1ef0276416d896db81c14582c"}, + {file = "idna-3.20.tar.gz", hash = "sha256:a7db850025b95ded1eae8a46181a1a6c56c92c96f0e2b005d9ff8dc0210cab44"}, ] [package.extras] @@ -217,7 +217,7 @@ description = "Backported and Experimental Type Hints for Python 3.9+" optional = false python-versions = ">=3.9" groups = ["main"] -markers = "python_version < \"3.13\"" +markers = "python_version < \"3.15\"" files = [ {file = "typing_extensions-4.16.0-py3-none-any.whl", hash = "sha256:481caa481374e813c1b176ada14e97f1f67a4539ce9cfeb3f350d78d6370c2e8"}, {file = "typing_extensions-4.16.0.tar.gz", hash = "sha256:dc983d19a509c94dba722ee6abd33940f7c05a89e243c47e907eb4db6f1a43e5"}, @@ -229,4 +229,4 @@ dev = ["coverage"] [metadata] lock-version = "2.1" python-versions = ">=3.11,<4" -content-hash = "7cd2f6bf3dd666ca02a0c83d60718a03b4aa322e181db7bbb1e325c4d65a7b61" +content-hash = "d805b68fcc4cfc75b7ad0d9a9aa77dd4c5effb48660f8fa9a93a5b3681121293"