Skip to content

Fix default version for docker builds #101

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix default version for docker builds #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
571ecb8
Include queuable extra in docker image, and use more recent datalake
oldpatricka Apr 17, 2025
b626f5c
Set AWS_REQUEST_CHECKSUM_CALCULATION when using moto
oldpatricka Apr 17, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on: [push, pull_request]

jobs:
test-client:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
python: [3.8, 3.9, "3.10", 3.12]
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ENV LC_ALL C.UTF-8
# TODO: keep requirements in one place
RUN pip install \
blinker>=1.4 \
boto>=2.49 \
boto3>=1.1.3 \
click>=5.1 \
Flask>=0.10.1 \
Expand All @@ -29,7 +30,7 @@ RUN pip install \
pyinotify>=0.9.4, \
raven>=5.0.0 \
'tox>4,<5' \
'datalake<2'
'datalake[queuable]>2'

RUN mkdir -p /opt/
COPY . /opt/
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ test-client: docker
docker run --rm --entrypoint tox $(IMAGE) -c /opt/client/tox.ini

test-ingester: docker
docker run --rm --entrypoint py.test $(IMAGE) ingester
docker run --rm --entrypoint py.test $(IMAGE) -vv ingester

test-api: docker
docker run --rm --entrypoint py.test $(IMAGE) api
docker run --rm --entrypoint py.test $(IMAGE) -vv api

.PHONY: test # Run the tests
test:
Expand Down
4 changes: 3 additions & 1 deletion api/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import pytest
import boto3
import os
from botocore.exceptions import (
ClientError as BotoClientError,
NoCredentialsError
Expand All @@ -24,7 +25,8 @@
from datalake.tests import * # noqa
from datalake.common import DatalakeRecord
from datalake.tests import generate_random_metadata

os.environ["AWS_REQUEST_CHECKSUM_CALCULATION"] = "when_required"
os.environ["AWS_RESPONSE_CHECKSUM_VALIDATION"] = "when_required"

YEAR_2010 = 1262304000000

Expand Down
3 changes: 3 additions & 0 deletions client/test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
"datalake.tests",
]

os.environ["AWS_REQUEST_CHECKSUM_CALCULATION"] = "when_required"
os.environ["AWS_RESPONSE_CHECKSUM_VALIDATION"] = "when_required"

# If we run with proper AWS credentials they will be used
# This will cause moto to fail
# But more critically, may impact production systems
Expand Down
2 changes: 2 additions & 0 deletions ingester/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

from datalake_ingester import SQSQueue

os.environ["AWS_REQUEST_CHECKSUM_CALCULATION"] = "when_required"
os.environ["AWS_RESPONSE_CHECKSUM_VALIDATION"] = "when_required"

@pytest.fixture
def dynamodb_connection(aws_connector):
Expand Down
Loading