File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed
Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -16,19 +16,20 @@ WORKDIR /app
1616# Install uv for fast dependency resolution
1717RUN pip install -U pip uv
1818
19- # Cachebust for data-model installation (change timestamp to force fresh install)
20- ARG CACHEBUST=2025-10-09T00:00:00Z
19+ # Use git commit SHA for precise cache control
20+ # Update via: docker build --build-arg DATA_MODEL_COMMIT=$(git ls-remote https://github.com/EOPF-Explorer/data-model.git refs/heads/fix/s1-encoding-conflict | cut -f1)
21+ ARG DATA_MODEL_COMMIT=fix/s1-encoding-conflict
2122
22- # Install eopf-geozarr from fix/s1-encoding-conflict branch (includes dask[distributed])
23+ # Install eopf-geozarr from data-model (includes dask[distributed])
2324RUN uv pip install --system --no-cache \
24- git+https://github.com/EOPF-Explorer/data-model.git@fix/s1-encoding-conflict \
25+ git+https://github.com/EOPF-Explorer/data-model.git@${DATA_MODEL_COMMIT} \
2526 pystac>=1.10.0 \
2627 httpx>=0.27.0 \
2728 boto3>=1.34.0 \
2829 tenacity>=8.0.0
2930
30- # Force fresh copy of scripts (invalidate cache )
31- ARG SCRIPTS_VERSION=2025-10-09T00:00:00Z
31+ # Copy scripts (cache invalidated by content changes, not manual ARG )
32+ ARG SCRIPTS_VERSION=auto
3233
3334# Copy scripts
3435COPY scripts/ /app/scripts/
Original file line number Diff line number Diff line change @@ -55,6 +55,7 @@ packages = ["scripts"]
5555[tool .pytest .ini_options ]
5656minversion = " 8.0"
5757testpaths = [" tests" ]
58+ pythonpath = [" scripts" ] # Fix import resolution for tests
5859python_files = [" test_*.py" ]
5960python_classes = [" Test*" ]
6061python_functions = [" test_*" ]
Original file line number Diff line number Diff line change @@ -105,8 +105,9 @@ def main(argv: list[str] | None = None) -> int:
105105 try :
106106 params = get_conversion_params (args .collection )
107107 except ValueError as exc :
108+ # Use print for CLI output, not logging
108109 print (f"Error: { exc } " , file = sys .stderr )
109- return 1
110+ sys . exit ( 1 )
110111
111112 if args .param :
112113 # Output single parameter (for shell variable assignment)
Original file line number Diff line number Diff line change 44
55set -euo pipefail
66
7+ # Error trap for better debugging
8+ trap ' echo "❌ Validation failed at line $LINENO with exit code $?"' ERR
9+
710NAMESPACE=" ${NAMESPACE:- devseed} "
811PASS=0
912FAIL=0
You can’t perform that action at this time.
0 commit comments