Skip to content

Update dg-api from 9.0.3 to 11.0.0 #1921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joshdimanteto wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Update dg-api from 9.0.3 to 11.0.0 #1921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a3b425
Update dg-api from 9.0.3 to fastapi branch
joshdimanteto Apr 27, 2026
82ec835
Modify apiUrl
joshdimanteto Apr 27, 2026
bfa23d3
Merge branch 'develop' into use-dg-api-v11
joshdimanteto Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: '3.10'
python-version: 3.11
architecture: x64

# ICAT Ansible clone and install dependencies
Expand Down Expand Up @@ -167,17 +167,18 @@ jobs:
with:
repository: ral-facilities/datagateway-api
path: datagateway-api
ref: v10.0.0
ref: v11.0.0

# 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
Expand Down Expand Up @@ -241,7 +242,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: '3.10'
python-version: 3.11
architecture: x64

# ICAT Ansible clone and install dependencies
Expand Down Expand Up @@ -337,17 +338,18 @@ jobs:
with:
repository: ral-facilities/datagateway-api
path: datagateway-api
ref: v10.0.0
ref: v11.0.0

# 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
Expand Down Expand Up @@ -411,7 +413,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
with:
python-version: '3.10'
python-version: 3.11
architecture: x64

# ICAT Ansible clone and install dependencies
Expand Down Expand Up @@ -474,17 +476,18 @@ jobs:
with:
repository: ral-facilities/datagateway-api
path: datagateway-api
ref: v10.0.0
ref: v11.0.0

# 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
Expand Down
2 changes: 1 addition & 1 deletion packages/datagateway-dataview/server/e2e-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/datagateway-download/server/e2e-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/datagateway-search/server/e2e-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading