From 3a3b425747af3b01c02fb6d5e308cb16eb2350dc Mon Sep 17 00:00:00 2001 From: Joshua Kitenge Date: Mon, 27 Apr 2026 09:05:51 +0000 Subject: [PATCH 1/2] Update dg-api from 9.0.3 to fastapi branch --- .github/workflows/ci-build.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e8c0fcac1..5c7828faf 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -81,7 +81,7 @@ jobs: - name: Setup Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: - python-version: 3.9 + python-version: 3.11 architecture: x64 # ICAT Ansible clone and install dependencies @@ -167,17 +167,18 @@ jobs: with: repository: ral-facilities/datagateway-api path: datagateway-api - ref: v9.0.3 + ref: port-over-to-fastapi-#519 # DataGateway API file setup - name: Create search_api_mapping.json run: cp datagateway-api/datagateway_api/search_api_mapping.json.example datagateway-api/datagateway_api/search_api_mapping.json - - name: Create log file - run: touch datagateway-api/datagateway_api/logs.log - name: Create config.yaml run: cp datagateway-api/datagateway_api/config.yaml.example datagateway-api/datagateway_api/config.yaml + - name: Create logging.ini + run: cp datagateway-api/datagateway_api/logging.example.ini datagateway-api/datagateway_api/logging.ini + # DataGateway API dependencies - name: Install Poetry run: pip install poetry @@ -241,7 +242,7 @@ jobs: - name: Setup Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: - python-version: 3.9 + python-version: 3.11 architecture: x64 # ICAT Ansible clone and install dependencies @@ -337,17 +338,18 @@ jobs: with: repository: ral-facilities/datagateway-api path: datagateway-api - ref: v9.0.3 + ref: port-over-to-fastapi-#519 # DataGateway API file setup - name: Create search_api_mapping.json run: cp datagateway-api/datagateway_api/search_api_mapping.json.example datagateway-api/datagateway_api/search_api_mapping.json - - name: Create log file - run: touch datagateway-api/datagateway_api/logs.log - name: Create config.yaml run: cp datagateway-api/datagateway_api/config.yaml.example datagateway-api/datagateway_api/config.yaml + - name: Create logging.ini + run: cp datagateway-api/datagateway_api/logging.example.ini datagateway-api/datagateway_api/logging.ini + # DataGateway API dependencies - name: Install Poetry run: pip install poetry @@ -411,7 +413,7 @@ jobs: - name: Setup Python uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0 with: - python-version: 3.9 + python-version: 3.11 architecture: x64 # ICAT Ansible clone and install dependencies @@ -474,17 +476,18 @@ jobs: with: repository: ral-facilities/datagateway-api path: datagateway-api - ref: v9.0.3 + ref: port-over-to-fastapi-#519 # DataGateway API file setup - name: Create search_api_mapping.json run: cp datagateway-api/datagateway_api/search_api_mapping.json.example datagateway-api/datagateway_api/search_api_mapping.json - - name: Create log file - run: touch datagateway-api/datagateway_api/logs.log - name: Create config.yaml run: cp datagateway-api/datagateway_api/config.yaml.example datagateway-api/datagateway_api/config.yaml + - name: Create logging.ini + run: cp datagateway-api/datagateway_api/logging.example.ini datagateway-api/datagateway_api/logging.ini + # DataGateway API dependencies - name: Install Poetry run: pip install poetry From 82ec835dd040cfd8a78331cc3d7ce9698a601606 Mon Sep 17 00:00:00 2001 From: Joshua Kitenge Date: Mon, 27 Apr 2026 10:45:14 +0000 Subject: [PATCH 2/2] Modify apiUrl --- packages/datagateway-dataview/server/e2e-settings.json | 2 +- packages/datagateway-download/server/e2e-settings.json | 2 +- packages/datagateway-search/server/e2e-settings.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/datagateway-dataview/server/e2e-settings.json b/packages/datagateway-dataview/server/e2e-settings.json index 861074988..53c0bce9a 100644 --- a/packages/datagateway-dataview/server/e2e-settings.json +++ b/packages/datagateway-dataview/server/e2e-settings.json @@ -7,7 +7,7 @@ "datasetGetCount": true }, "idsUrl": "https://localhost:8181/ids", - "apiUrl": "http://localhost:5000", + "apiUrl": "http://localhost:5000/datagateway-api", "downloadApiUrl": "https://localhost:8181/topcat", "doiMinterUrl": "http://localhost:8000", "dataCiteUrl": "https://api.test.datacite.org", diff --git a/packages/datagateway-download/server/e2e-settings.json b/packages/datagateway-download/server/e2e-settings.json index d9b5fc654..9c25c192f 100644 --- a/packages/datagateway-download/server/e2e-settings.json +++ b/packages/datagateway-download/server/e2e-settings.json @@ -1,6 +1,6 @@ { "facilityName": "LILS", - "apiUrl": "http://localhost:5000", + "apiUrl": "http://localhost:5000/datagateway-api", "downloadApiUrl": "https://localhost:8181/topcat", "idsUrl": "https://localhost:8181/ids", "doiMinterUrl": "http://localhost:8000", diff --git a/packages/datagateway-search/server/e2e-settings.json b/packages/datagateway-search/server/e2e-settings.json index 4e4127b73..d435b1529 100644 --- a/packages/datagateway-search/server/e2e-settings.json +++ b/packages/datagateway-search/server/e2e-settings.json @@ -1,7 +1,7 @@ { "facilityName": "LILS", "idsUrl": "https://localhost:8181/ids", - "apiUrl": "http://localhost:5000", + "apiUrl": "http://localhost:5000/datagateway-api", "downloadApiUrl": "https://localhost:8181/topcat", "icatUrl": "https://localhost:8181/icat", "selectAllSetting": true,