Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.2
3.9.5
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ install-poetry:
poetry install

up:
poetry run docker-compose up -d localstack && poetry run docker-compose-wait --wait
poetry run docker compose up -d localstack

down:
poetry run docker-compose down
poetry run docker compose down

test: up
make -C s3CacheTask test
Expand Down
8 changes: 4 additions & 4 deletions azure/azure-build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ stages:
displayName: Print AWS info

- task: UsePythonVersion@0
displayName: "Use Python 3.8"
displayName: "Use Python 3.9"
inputs:
versionSpec: "3.8"
versionSpec: "3.9"

- task: NodeTool@0
displayName: "Use Node 13"
displayName: "Use Node 18"
inputs:
versionSpec: '13.x'
versionSpec: '18.x'

- bash: |
node --version
Expand Down
10 changes: 8 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3.6'
version: '3.8'
services:
localstack:
image: localstack/localstack:latest
Expand All @@ -7,8 +7,14 @@ services:
- DEBUG=1
- EDGE_PORT=4666
healthcheck:
test: awslocal s3 ls
test: ["CMD-SHELL", "awslocal s3 ls"]
interval: 3s
timeout: 10s
ports:
- '4666:4666'

dependent_service:
image: localstack/localstack:latest
depends_on:
localstack:
condition: service_healthy
1,077 changes: 653 additions & 424 deletions poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ authors = ["Alex Carrie <[email protected]>"]
license = "MIT"

[tool.poetry.dependencies]
python = "^3.8"
docker-compose-wait = "^1.2.2"
python = "^3.9"

[tool.poetry.dev-dependencies]

[tool.poetry.group.dev.dependencies]
jq = "^1.0.1"
docker-compose = "^1.25.5"
docker-compose = "^1.29.2"

[tool.pytest.ini_options]
python_files = "*_tests.py test_*.py"
Expand Down
Loading
Loading