From 0ab5d175d292f0c77827d89c8ced6e75967977a5 Mon Sep 17 00:00:00 2001 From: Michael Woolnough Date: Mon, 23 Oct 2023 16:30:18 +0100 Subject: [PATCH 1/5] Correct type on GraphQL endpoint. --- softpack_core/schemas/package_collection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softpack_core/schemas/package_collection.py b/softpack_core/schemas/package_collection.py index a83febc..cf4521a 100644 --- a/softpack_core/schemas/package_collection.py +++ b/softpack_core/schemas/package_collection.py @@ -61,5 +61,5 @@ class Query: """GraphQL query schema.""" packageCollections: list[ - PackageCollection + PackageMultiVersion ] = PackageCollection.iter # type: ignore From 21a923cf71d2d172b690cedc73c110944a20be77 Mon Sep 17 00:00:00 2001 From: Michael Woolnough Date: Tue, 24 Oct 2023 09:15:16 +0100 Subject: [PATCH 2/5] Remove checkout of non-existent artefacts repo. --- .github/workflows/dev.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4013d29..c73213d 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -36,12 +36,6 @@ jobs: - name: Checkout the repository uses: actions/checkout@v3 - - name: Checkout an artifacts repository - uses: actions/checkout@v3 - with: - repository: softpack-io/softpack-artifacts - path: softpack-artifacts - - name: Setup python uses: actions/setup-python@v4 with: From d27dd10cb0a21016f389e174f061847c93c924f8 Mon Sep 17 00:00:00 2001 From: Michael Woolnough Date: Tue, 24 Oct 2023 09:25:57 +0100 Subject: [PATCH 3/5] Replace non-existing test artefacts repo with one that exists. --- .github/workflows/dev.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index c73213d..303efb5 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -36,6 +36,12 @@ jobs: - name: Checkout the repository uses: actions/checkout@v3 + - name: Checkout an artifacts repository + uses: actions/checkout@v3 + with: + repository: mjkw31/softpack-artifacts + path: softpack-artifacts + - name: Setup python uses: actions/setup-python@v4 with: From 952d3c96bc9f388f8ca2f2c80982acad414edaef Mon Sep 17 00:00:00 2001 From: Michael Woolnough Date: Tue, 24 Oct 2023 09:57:46 +0100 Subject: [PATCH 4/5] Change repo in default config to one that exists. --- softpack_core/config/conf/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softpack_core/config/conf/config.yml b/softpack_core/config/conf/config.yml index b41ae77..c593ec6 100644 --- a/softpack_core/config/conf/config.yml +++ b/softpack_core/config/conf/config.yml @@ -11,7 +11,7 @@ server: artifacts: repo: - url: https://github.com/softpack-io/softpack-artifacts.git + url: https://github.com/mjkw31/softpack-artifacts username: softpack-core author: softpack email: softpack@sanger.ac.uk From 3a40df6871f35934a735f8ad71a96f7677557349 Mon Sep 17 00:00:00 2001 From: Michael Woolnough Date: Tue, 24 Oct 2023 10:03:50 +0100 Subject: [PATCH 5/5] Updte urlliv3 version due to security issue. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 22853a1..b93801a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,5 +21,5 @@ pyyaml_env_tag==0.1 regex==2023.6.3 requests==2.31.0 six==1.16.0 -urllib3==2.0.6 +urllib3==2.0.7 watchdog==3.0.0