Skip to content

Commit

Permalink
Merge pull request ioos#194 from ocefpaf/maintenance
Browse files Browse the repository at this point in the history
Maintenance
  • Loading branch information
ocefpaf authored May 8, 2024
2 parents fdec369 + bdab0f8 commit 4910734
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 36 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@

version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
labels:
- "Bot"
groups:
github-actions:
patterns:
- '*'
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Setup Micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 #v1
with:
environment-name: IOOS
init-shell: bash
Expand All @@ -29,7 +29,7 @@ jobs:
- name: GitHub Pages action
if: github.ref == 'refs/heads/main'
uses: peaceiris/actions-gh-pages@v4
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e #v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: jupyterbook/_build/html
4 changes: 2 additions & 2 deletions .github/workflows/test-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Setup Micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 #v1
with:
environment-name: IOOS
init-shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_data_access_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Setup Micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 #v1
with:
environment-name: IOOS
init-shell: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Setup Micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 #v1
with:
environment-name: IOOS
init-shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_data_management_notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Setup Micromamba
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@422500192359a097648154e8db4e39bdb6c6eed7 #v1
with:
environment-name: IOOS
init-shell: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"source": [
"kw = dict(wildCard=\"*\", escapeChar=\"\\\\\", singleChar=\"?\", propertyname=\"apiso:AnyText\")\n",
"\n",
"or_filt = fes.Or([fes.PropertyIsLike(literal=(\"*%s*\" % val), **kw) for val in cf_names])\n",
"or_filt = fes.Or([fes.PropertyIsLike(literal=(f\"*{val}*\"), **kw) for val in cf_names])\n",
"\n",
"begin, end = fes_date_filter(start, stop)\n",
"bbox_crs = fes.BBox(bbox, crs=crs)\n",
Expand Down Expand Up @@ -1037,7 +1037,6 @@
}
],
"source": [
"%matplotlib inline\n",
"import matplotlib.pyplot as plt\n",
"\n",
"fig, ax = plt.subplots(figsize=(11, 2.75))\n",
Expand All @@ -1064,7 +1063,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.10"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -765,9 +765,7 @@
" track_url = f\"https://gliders.ioos.us/status/api/tracks.php?dataset_id={deployment['name']}&type=full\"\n",
" response = requests.get(track_url)\n",
" if response.status_code != 200:\n",
" raise OSError(\n",
" \"Failed to get Glider Track for %s\" % deployment[\"deployment_dir\"]\n",
" )\n",
" raise OSError(f\"Failed to get Glider Track for {deployment[\"deployment_dir\"]}\")\n",
" geometry = parse_geometry(response.json())\n",
" coords = LineString(geometry[\"coordinates\"])\n",
" return coords"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
" )\n",
"\n",
" or_filt = fes.Or(\n",
" [fes.PropertyIsLike(literal=(\"*%s*\" % val), **kw) for val in config[\"cf_names\"]]\n",
" [fes.PropertyIsLike(literal=(f\"*{val}*\"), **kw) for val in config[\"cf_names\"]]\n",
" )\n",
"\n",
" not_filt = fes.Not([fes.PropertyIsLike(literal=\"GRIB-2\", **kw)])\n",
Expand Down Expand Up @@ -705,8 +705,6 @@
}
],
"source": [
"%matplotlib inline\n",
"\n",
"ax = pd.concat(data).plot(figsize=(11, 2.25))"
]
},
Expand Down Expand Up @@ -1275,7 +1273,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.0"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@
" )\n",
" # First published date.\n",
" pubdate = root.find(date_path, namespaces)\n",
" print(\"\\nFirst published date = %s\" % util.testXMLValue(pubdate))\n",
" print(f\"\\nFirst published date = {util.testXMLValue(pubdate)}\")\n",
"\n",
" # Data Temporal Coverage.\n",
" temporal_extent_path = (\n",
Expand Down Expand Up @@ -450,7 +450,7 @@
" plat_name = MD_keywords.find(\n",
" \".//gmd:keyword/gco:CharacterString\", namespaces\n",
" ).text\n",
" print(\"Provider Platform Code = %s\" % plat_name)\n",
" print(f\"Provider Platform Code = {plat_name}\")\n",
" df.loc[df[\"Link_Xml\"] == url, [\"provider_platform_name\"]] = plat_name\n",
" break\n",
"\n",
Expand Down Expand Up @@ -499,7 +499,7 @@
" for trans_size in root.iterfind(\".//gmd:transferSize\", namespaces):\n",
" if trans_size.find(\".//gco:Real\", namespaces).text:\n",
" sizes = trans_size.find(\".//gco:Real\", namespaces).text\n",
" print(\"Current AIP Size = %s MB\" % sizes)\n",
" print(f\"Current AIP Size = {sizes} MB\")\n",
"\n",
" df.loc[df[\"Link_Xml\"] == url, [\"package_size_mb\"]] = sizes\n",
" break\n",
Expand Down Expand Up @@ -601,7 +601,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.5"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"source": [
"kw = dict(wildCard=\"*\", escapeChar=\"\\\\\", singleChar=\"?\", propertyname=\"apiso:AnyText\")\n",
"\n",
"or_filt = fes.Or([fes.PropertyIsLike(literal=(\"*%s*\" % val), **kw) for val in cf_names])\n",
"or_filt = fes.Or([fes.PropertyIsLike(literal=(f\"*{val}*\"), **kw) for val in cf_names])\n",
"\n",
"# Exclude GNOME returns.\n",
"not_filt = fes.Not([fes.PropertyIsLike(literal=\"*GNOME*\", **kw)])\n",
Expand Down Expand Up @@ -687,7 +687,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.7"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,7 @@
"\n",
"df = pd.DataFrame(columns=[\"locationID\", \"region\", \"sponsor\", \"met\", \"wave\"])\n",
"for month in months:\n",
" url = (\n",
" \"https://www.ndbc.noaa.gov/ioosstats/rpts/%s_ioos_regional.csv\"\n",
" % month.replace(\"-\", \"_\")\n",
" )\n",
" url = f\"https://www.ndbc.noaa.gov/ioosstats/rpts/{month.replace(\"-\", \"_\")}_ioos_regional.csv\"\n",
" df1 = pd.read_csv(url, dtype={\"met\": float, \"wave\": float})\n",
" df1[\"time (UTC)\"] = pd.to_datetime(month)\n",
" df = pd.concat([df, df1])\n",
Expand Down Expand Up @@ -943,7 +940,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.4"
"version": "3.12.2"
},
"widgets": {
"application/vnd.jupyter.widget-state+json": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
" )\n",
"\n",
" or_filt = fes.Or(\n",
" [fes.PropertyIsLike(literal=(\"*%s*\" % val), **kw) for val in config[\"cf_names\"]]\n",
" [fes.PropertyIsLike(literal=(f\"*{val}*\"), **kw) for val in config[\"cf_names\"]]\n",
" )\n",
"\n",
" not_filt = fes.Not([fes.PropertyIsLike(literal=\"GRIB-2\", **kw)])\n",
Expand Down Expand Up @@ -1660,7 +1660,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.0"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@
],
"source": [
"for index, row in lut_worms.iterrows():\n",
" print(\"\\n**Searching for scientific name = %s**\" % row[\"scientificName\"])\n",
" print(f\"\\n**Searching for scientific name = {row[\"scientificName\"]}**\")\n",
" resp = pyworms.aphiaRecordsByMatchNames(row[\"scientificName\"])[0][0]\n",
" pprint.pprint(resp)\n",
" lut_worms.loc[index, \"acceptedname\"] = resp[\"valid_name\"]\n",
Expand Down Expand Up @@ -1598,7 +1598,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.11.5"
"version": "3.12.2"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 4910734

Please sign in to comment.