Skip to content

Commit 9bc40eb

Browse files
Change ECCO_PASSWORD to ECCO_WEBDAV_PASSWORD (#586)
* ECCO_PASSWORD -> ECCO_WEBDAV_PASSWORD * bump patch release * more changes * more ECCO-related instructions * pin Reactant <= 0.2.146 * ECCO_PASSWORD -> ECCO_WEBDAV_PASSWORD * rerun tests * use climacommon/2025_07_30 this includes the ECCO_WEBDAV_PASSWORD env variable --------- Co-authored-by: Simone Silvestri <[email protected]>
1 parent 8479089 commit 9bc40eb

File tree

6 files changed

+26
-22
lines changed

6 files changed

+26
-22
lines changed

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
agents:
22
queue: new-central
33
slurm_mem: 8G
4-
modules: climacommon/2025_03_18
4+
modules: climacommon/2025_07_30
55

66
timeout_in_minutes: 1440
77

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
TEST_GROUP: "downloading"
5252
ECCO_USERNAME: ${{ secrets.ECCO_USERNAME }} # To download ECCO data from the podaac website
53-
ECCO_PASSWORD: ${{ secrets.ECCO_PASSWORD }} # To download ECCO data from the podaac website
53+
ECCO_WEBDAV_PASSWORD: ${{ secrets.ECCO_WEBDAV_PASSWORD }} # To download ECCO data from the podaac website
5454
- uses: julia-actions/julia-processcoverage@v1
5555
- uses: codecov/codecov-action@v5
5656
with:
@@ -86,8 +86,8 @@ jobs:
8686
- uses: julia-actions/julia-runtest@v1
8787
env:
8888
TEST_GROUP: "copernicus_downloading"
89-
COPERNICUSMARINE_SERVICE_USERNAME: ${{ secrets.COPERNICUSMARINE_SERVICE_USERNAME }} # To download ECCO data from the podaac website
90-
COPERNICUSMARINE_SERVICE_PASSWORD: ${{ secrets.COPERNICUSMARINE_SERVICE_PASSWORD }} # To download ECCO data from the podaac website
89+
COPERNICUSMARINE_SERVICE_USERNAME: ${{ secrets.COPERNICUSMARINE_SERVICE_USERNAME }}
90+
COPERNICUSMARINE_SERVICE_PASSWORD: ${{ secrets.COPERNICUSMARINE_SERVICE_PASSWORD }}
9191
- uses: julia-actions/julia-processcoverage@v1
9292
- uses: codecov/codecov-action@v5
9393
with:
@@ -128,3 +128,4 @@ jobs:
128128
with:
129129
files: lcov.info
130130
token: ${{ secrets.CODECOV_TOKEN }}
131+

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Oceananigans = "0.97.4"
5959
OffsetArrays = "1.14"
6060
PrecompileTools = "1"
6161
PythonCall = "0.9"
62-
Reactant = "0.2.45"
62+
Reactant = "0.2.45 - 0.2.146"
6363
Scratch = "1"
6464
SeawaterPolynomials = "0.3.5"
6565
StaticArrays = "1"

src/DataWrangling/DataWrangling.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,24 +147,27 @@ Arguments
147147
148148
!!! info "Credential setup requirements for ECCO datasets"
149149
150-
For ECCO datasets, the data download requires a username and password to be provided in
151-
the `ECCO_USERNAME` and `ECCO_PASSWORD` environment variables respectively. This can be
150+
For ECCO datasets, the data download requires "WebDAV/Programmatic API" credentials from
151+
NASA's Earthdrive. The WebDAV/Programmatic API username and password need to be provided in
152+
the `ECCO_USERNAME` and `ECCO_WEBDAV_PASSWORD` environment variables respectively. This can be
152153
done by exporting the environment variables in the shell before running the script, or by
153154
launching julia with
154155
155156
```
156-
ECCO_USERNAME=myusername ECCO_PASSWORD=mypassword julia
157+
ECCO_USERNAME=myusername ECCO_WEBDAV_PASSWORD=mypassword julia
157158
```
158159
159160
or by invoking
160161
161162
```julia
162163
julia> ENV["ECCO_USERNAME"] = "myusername"
163164
164-
julia> ENV["ECCO_PASSWORD"] = "mypassword"
165+
julia> ENV["ECCO_WEBDAV_PASSWORD"] = "mypassword"
165166
```
166167
167-
within julia.
168+
within julia. More detailed instructions for obtaining WebDAV credentials are at:
169+
170+
https://github.com/CliMA/ClimaOcean.jl/blob/main/src/DataWrangling/ECCO/README.md
168171
"""
169172
function download_dataset end # methods specific to datasets are added within each dataset module
170173
function inpainted_metadata_path end

src/DataWrangling/ECCO/ECCO.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ end
257257

258258
function download_dataset(metadata::ECCOMetadata)
259259
username = get(ENV, "ECCO_USERNAME", nothing)
260-
password = get(ENV, "ECCO_PASSWORD", nothing)
260+
password = get(ENV, "ECCO_WEBDAV_PASSWORD", nothing)
261261
dir = metadata.dir
262262

263263
# Create a temporary directory to store the .netrc file
@@ -276,14 +276,14 @@ function download_dataset(metadata::ECCOMetadata)
276276
if !isfile(filepath)
277277
instructions_msg = "\n See ClimaOcean.jl/src/DataWrangling/ECCO/README.md for instructions."
278278
if isnothing(username)
279-
msg = "Could not find the ECCO_PASSWORD environment variable. \
279+
msg = "Could not find the ECCO_USERNAME environment variable. \
280280
See ClimaOcean.jl/src/DataWrangling/ECCO/README.md for instructions on obtaining \
281-
and setting your ECCO_USERNAME and ECCO_PASSWORD." * instructions_msg
281+
and setting your ECCO_USERNAME and ECCO_WEBDAV_PASSWORD." * instructions_msg
282282
throw(ArgumentError(msg))
283283
elseif isnothing(password)
284-
msg = "Could not find the ECCO_PASSWORD environment variable. \
284+
msg = "Could not find the ECCO_WEBDAV_PASSWORD environment variable. \
285285
See ClimaOcean.jl/src/DataWrangling/ECCO/README.md for instructions on obtaining \
286-
and setting your ECCO_USERNAME and ECCO_PASSWORD." * instructions_msg
286+
and setting your ECCO_USERNAME and ECCO_WEBDAV_PASSWORD." * instructions_msg
287287
throw(ArgumentError(msg))
288288
end
289289
@info "Downloading ECCO data: $(metadatum.name) in $(metadatum.dir)..."

src/DataWrangling/ECCO/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Setting `ECCO_USERNAME` and `ECCO_PASSWORD` environment variables for downloading ECCO datasets
1+
# Setting `ECCO_USERNAME` and `ECCO_WEBDAV_PASSWORD` environment variables for downloading ECCO datasets
22

3-
The first step is to find the username and password for your "programmatic API" credentials on NASA's Earthdrive.
3+
The first step is to find the username and password for your "WebDAV/Programmatic API" credentials on NASA's Earthdrive.
44
For this you have to either login or make an account via the "EARTHDATA login":
55

66
> https://urs.earthdata.nasa.gov
@@ -13,19 +13,19 @@ This should produce a screen similar to the following:
1313

1414
![image](https://github.com/user-attachments/assets/490d9098-aece-4e9c-82d7-3ec86e833347)
1515

16-
showing your Programmatic API credentials -- except in place of the black boxes that say `your_username` and `cRaZYpASSwORD`,
16+
showing your WebDAV/Programmatic API credentials -- except in place of the black boxes that say `your_username` and `cRaZYpASSwORD`,
1717
you should see _your_ username and password.
18-
Copy the content of `Username:` to the environment variable `ECCO_USERNAME` and the content of `Password` to `ECCO_PASSWORD`,
18+
Copy the content of `Username:` to the environment variable `ECCO_USERNAME` and the content of `Password` to `ECCO_WEBDAV_PASSWORD`,
1919
either in a file:
2020

2121
```bash
2222
export ECCO_USERNAME=your_username
23-
export ECCO_PASSWORD=cRaZYpASSwORD
23+
export ECCO_WEBDAV_PASSWORD=cRaZYpASSwORD
2424
```
2525

26-
or within Julia by writing
26+
or within Julia by
2727

2828
```julia
2929
ENV["ECCO_USERNAME"] = "your_username"
30-
ENV["ECCO_PASSWORD"] = "cRaZYpASSwORD"
30+
ENV["ECCO_WEBDAV_PASSWORD"] = "cRaZYpASSwORD"
3131
```

0 commit comments

Comments
 (0)