Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
da27244
python version upgrade
koppuravuris Sep 1, 2025
4465f5c
python version upgrade
koppuravuris Sep 1, 2025
1767d49
python version upgrade
koppuravuris Sep 1, 2025
196606c
python version upgrade
koppuravuris Sep 1, 2025
c619164
python version upgrade
koppuravuris Sep 1, 2025
fab161f
python version upgrade
koppuravuris Sep 1, 2025
905a5b1
python version upgrade
koppuravuris Sep 1, 2025
86092d1
python version upgrade
koppuravuris Sep 1, 2025
2eaca7f
python version upgrade
koppuravuris Sep 1, 2025
a74e1b5
python version upgrade
koppuravuris Sep 1, 2025
83df28b
python version upgrade
koppuravuris Sep 1, 2025
beaf49d
test
koppuravuris Sep 1, 2025
20b1d28
test
koppuravuris Sep 1, 2025
3cab636
test
koppuravuris Sep 1, 2025
e1f56cf
python-version-upgrade
NautiyalVikas1 Sep 2, 2025
8b21e1c
python-version-upgrade
NautiyalVikas1 Sep 2, 2025
8d612d5
python-version-upgrade
NautiyalVikas1 Sep 2, 2025
ac26bff
python-version-upgrade
NautiyalVikas1 Sep 2, 2025
eebe5bf
python-version-upgrade
NautiyalVikas1 Sep 2, 2025
546a852
python-version-upgrade
NautiyalVikas1 Sep 2, 2025
958c7c8
Reverted docker compose v2
Valswyn-NHS Sep 2, 2025
9c5f38e
Upgraded docker compose v2
Valswyn-NHS Sep 2, 2025
6a4beaa
Upgarde nvm
Valswyn-NHS Sep 2, 2025
475e29f
changed hash for S3CacheTest
NautiyalVikas1 Sep 2, 2025
ce8b72b
Degrade docker
Valswyn-NHS Sep 2, 2025
bf56741
Upgraded docker to 7.1 and removed compose wait
Valswyn-NHS Sep 2, 2025
03354b3
changed Make File for Wait command
NautiyalVikas1 Sep 2, 2025
59a7d1b
Committed lock file
Valswyn-NHS Sep 2, 2025
451792a
Removed legagy docker-compose
Valswyn-NHS Sep 2, 2025
d580c14
removed dependency on docker-compose-wait
koppuravuris Sep 2, 2025
31538f3
removed dependency on docker-compose-wait
koppuravuris Sep 2, 2025
f54301f
hash value fixed
koppuravuris Sep 2, 2025
8fc4537
hash value fixed
koppuravuris Sep 2, 2025
c324316
hash value fixed
koppuravuris Sep 2, 2025
e1cccc4
reverted changes to make up command to use --wait flag
koppuravuris Sep 2, 2025
408eba4
updated hash in test case
NautiyalVikas1 Sep 2, 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 .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.8.2
3.9.0
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 --wait -d localstack

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

test: up
make -C s3CacheTask test
Expand Down
17 changes: 13 additions & 4 deletions azure/azure-build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,23 @@ 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 20"
inputs:
versionSpec: '13.x'
versionSpec: '20.x'

- bash: |
node --version
npm --version
displayName: Versions

- bash: |
npm config delete prefix
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
source ~/.nvm/nvm.sh
node --version
npm --version
Expand All @@ -67,6 +69,13 @@ stages:
- bash: |
set -e
source ~/.nvm/nvm.sh
npm config delete prefix || true
unset NPM_CONFIG_PREFIX
nvm install v14.21.1
nvm use --delete-prefix v14.21.1 --silent
node --version
npm --version
nvm --version
nvm install-latest-npm
displayName: Update npm

Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.6'
services:
localstack:
image: localstack/localstack:latest
Expand Down
1,027 changes: 528 additions & 499 deletions poetry.lock

Large diffs are not rendered by default.

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

[tool.poetry.dependencies]
python = "^3.8"
docker-compose-wait = "^1.2.2"
python = "^3.9"
requests = "^2.27.1"
python-on-whales = "^0.57.0"

[tool.poetry.dev-dependencies]
jq = "^1.0.1"
docker-compose = "^1.25.5"
docker = "7.1.0"
requests = "^2.27.1"
python-dotenv = "^1.0.0"

[tool.pytest.ini_options]
python_files = "*_tests.py test_*.py"
norecursedirs = ".git .venv .eggs build dist terraform"

[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"
build-backend = "poetry.masonry.api"
2 changes: 1 addition & 1 deletion s3CacheTask/s3Utils/tests/s3CacheActionUtils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ describe('hashFileOrString', () => {
});

const part = 'foo/bar/foo.txt';
const expectHash = 'fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9';
const expectHash = '089740ac2d3e5350a4e6bf309405c8130ca137a6aac457d3dabe552539fd7080';

expect(await hashFileOrString(part, __dirname)).toBe(expectHash);

Expand Down
Loading