Skip to content

Feature/etl milestone 2 #1856

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
adamkorynta wants to merge 7 commits into from
+90,637 −16,361
Open

Feature/etl milestone 2 #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b6eb7c
milestone2
adamkorynta Jun 22, 2026
b639852
cleanup data dir
adamkorynta Aug 18, 2026
dc7eacd
cleanup qualified ids
adamkorynta Aug 18, 2026
44979fe
cleanup env variable renames
adamkorynta Aug 18, 2026
2c2bf1b
doc cleanup
adamkorynta Aug 18, 2026
ded4d85
remove fragile tests
adamkorynta Aug 18, 2026
846f510
remove regi-specific functionality in etl-expander
adamkorynta Aug 21, 2026
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: 2 additions & 0 deletions cda-etl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ RUN pip install --no-cache-dir -r requirements.txt

COPY src/ /app/src/

ENV PYTHONPATH=/app/src/cda_etl:/app/src

CMD ["python", "src/cda_etl/main.py"]
2 changes: 1 addition & 1 deletion cda-etl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ tasks.register('runEtlUnitTests', DockerExec) {
doFirst {
def args = [
'docker', 'run', '--rm',
'-e', 'PYTHONPATH=/app/src/cda_etl',
'-e', 'PYTHONPATH=/app/src/cda_etl:/app/src',
'-v', "${projectDir}/src:/app/src"
]

Expand Down
4 changes: 4 additions & 0 deletions cda-etl/data/sample-data/SWT/Clobs/FLOW.EUFA.PROJECT_TOTAL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"office-id": "SWT",
"id": "FLOW.EUFA.PROJECT_TOTAL"
}
6 changes: 6 additions & 0 deletions cda-etl/data/sample-data/SWT/LocationLevels/EUFA-Dam.Elev.Inst.0.Top of Flood.por.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"levels": [],
"page": "MHx8MHx8MTAw",
"page-size": 100,
"total": 0
}
25 changes: 25 additions & 0 deletions cda-etl/data/sample-data/SWT/Properties/LOCATION LEVEL ASSOCIATION.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[
{
"office-id": "SWT",
"category": "LOCATION LEVEL ASSOCIATION",
"name": "Regi_project_INPUT.Evap_pan_to_lake_multiplier.?GLOBAL?"
},
{
"office-id": "SWT",
"category": "LOCATION LEVEL ASSOCIATION",
"name": "Regi_project_INPUT.Evap_pan_to_lake_multiplier.COPA",
"value": "COPA.Coeff.Inst.0.Pan Evaporation Multiplier"
},
{
"office-id": "SWT",
"category": "LOCATION LEVEL ASSOCIATION",
"name": "Regi_project_INPUT.Evap_pan_to_lake_multiplier.KEYS",
"value": "KEYS.Coeff.Inst.0.Pan Evaporation Multiplier"
},
{
"office-id": "SWT",
"category": "LOCATION LEVEL ASSOCIATION",
"name": "Regi_project_INPUT.Evap_seasonal_pan_value.COPA",
"value": "COPA.Coeff.Inst.0.Pan Evaporation Multiplier"
}
]
16 changes: 16 additions & 0 deletions cda-etl/data/sample-data/SWT/Properties/LOCATION RATING ASSOCIATION.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[
{
"office-id": "SWT",
"category": "LOCATION RATING ASSOCIATION",
"name": "Regi_project_INPUT.Elev_Area.?GLOBAL?",
"value": "?GLOBAL?.Elev;Area.Linear.Production",
"comment": "Description for: Elev Area Rating"
},
{
"office-id": "SWT",
"category": "LOCATION RATING ASSOCIATION",
"name": "Regi_project_INPUT.Elev_Stor.?GLOBAL?",
"value": "?GLOBAL?.Elev;Stor.Linear.Production",
"comment": "Description for: Elev Stor Rating"
}
]
Loading
Loading