Skip to content

Commit c74df0f

Browse files
authored
HDXDSYS-1684 Failure in HAPI Pipelines publishing (OCHA-DAP#218)
* Update requirements in Docker * Use uv instead of pip-compile * Update Country requirement * Scraper base image is obsolete - use python base image instead
1 parent 90f0abb commit c74df0f

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.github/workflows/publish.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
submodules: true
1818

1919
- name: Set up Docker Buildx
20-
uses: docker/setup-buildx-action@v2
20+
uses: docker/setup-buildx-action@v3
2121

2222
- name: Configure AWS credentials
23-
uses: aws-actions/configure-aws-credentials@v1
23+
uses: aws-actions/configure-aws-credentials@v4
2424
with:
2525
aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
2626
aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
2727
aws-region: us-east-1
2828

2929
- name: Login to Public ECR
30-
uses: docker/login-action@v2
30+
uses: docker/login-action@v3
3131
with:
3232
registry: public.ecr.aws
3333
username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
@@ -37,11 +37,11 @@ jobs:
3737

3838
- name: Create prod requirements
3939
run: |
40-
pip install --upgrade pip-tools
41-
pip-compile pyproject.toml --resolver=backtracking --upgrade -q -c requirements.txt -o prod-requirements.txt
40+
pip install --upgrade uv
41+
uv pip compile pyproject.toml --resolver=backtracking --upgrade -q -c requirements.txt -o prod-requirements.txt
4242
4343
- name: Build, tag, and push image to Amazon ECR
44-
uses: docker/build-push-action@v4
44+
uses: docker/build-push-action@v6
4545
with:
4646
context: .
4747
push: true

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7+
## [0.10.33] = 2025-01-22
8+
9+
### Fixed
10+
11+
- uv instead of pip-compile for publish GH Actions job
12+
713
## [0.10.32] = 2025-01-22
814

915
### Changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM public.ecr.aws/unocha/hdx-scraper-baseimage:stable
1+
FROM public.ecr.aws/unocha/python:3.12-stable
22

33
WORKDIR /srv
44

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ requires-python = ">=3.8"
3636
dependencies = [
3737
"hapi-schema>= 0.9.6",
3838
"hdx-python-api>= 6.3.7",
39-
"hdx-python-country>= 3.8.6",
39+
"hdx-python-country>= 3.8.7",
4040
"hdx-python-database[postgresql]>= 1.3.4",
4141
"hdx-python-scraper>= 2.5.5",
4242
"hdx-python-utilities>= 3.8.2",

requirements.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ attrs==24.3.0
88
# jsonlines
99
# jsonschema
1010
# referencing
11-
cachetools==5.5.0
11+
cachetools==5.5.1
1212
# via google-auth
1313
certifi==2024.12.14
1414
# via requests
@@ -60,7 +60,7 @@ hdx-python-api==6.3.7
6060
# via
6161
# hapi-pipelines (pyproject.toml)
6262
# hdx-python-scraper
63-
hdx-python-country==3.8.6
63+
hdx-python-country==3.8.7
6464
# via
6565
# hapi-pipelines (pyproject.toml)
6666
# hdx-python-api

0 commit comments

Comments
 (0)