Skip to content

Commit 887e274

Browse files
authored
Merge pull request #672 from British-Oceanographic-Data-Centre/develop
Correct release
2 parents 8afe7ac + cf1f539 commit 887e274

File tree

6 files changed

+38
-11
lines changed

6 files changed

+38
-11
lines changed

.github/workflows/markdown-general.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,7 @@ jobs:
4242
sudo apt-get install -y libgeos-dev
4343
pip install cartopy==0.21.0
4444
pip install zarr
45+
pip install xarray[complete]
46+
pip install aiohttp requests
4547
mv config ./example_scripts/notebook_tutorials/runnable_notebooks/general/config
4648
bash notebook_to_md.sh general

.github/workflows/unit_test_contents.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ jobs:
2222
sudo apt-get update
2323
sudo apt-get install -y libgeos-dev
2424
pip install cartopy==0.21.0
25+
pip install zarr
26+
pip install xarray[complete]
27+
pip install aiohttp requests
2528
python unit_testing/generate_unit_test_contents.py
2629
- name: Commit changes
2730
run: |

.github/workflows/verify_package.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ jobs:
3434
sudo apt-get update
3535
sudo apt-get install -y libgeos-dev
3636
pip install cartopy==0.21.0
37+
pip install zarr
3738
pytest tests

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ authors:
4646
- family-names: "de Mora"
4747
given-names: "Lee"
4848
orcid: "https://orcid.org/0000-0002-5080-3149"
49-
title: "British-Oceanographic-Data-Centre/COAsT: v3.2.2"
50-
version: v3.2.2
51-
date-released: 2023-12-06
49+
title: "British-Oceanographic-Data-Centre/COAsT: v3.3.0"
50+
version: v3.3.0
51+
date-released: 2023-12-11

example_scripts/notebook_tutorials/runnable_notebooks/general/zarr_files.ipynb

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"id": "761fde27-8ef4-4805-887c-d795da34902e",
4545
"metadata": {},
4646
"source": [
47-
"`pip install zarr`"
47+
"`pip install zarr xarray[complete] aiohttp requests`"
4848
]
4949
},
5050
{
@@ -73,16 +73,26 @@
7373
},
7474
{
7575
"cell_type": "code",
76-
"execution_count": 16,
76+
"execution_count": 1,
7777
"id": "582e5ae5-e61d-409d-aa33-206f6ff3c0bd",
7878
"metadata": {},
79-
"outputs": [],
79+
"outputs": [
80+
{
81+
"name": "stderr",
82+
"output_type": "stream",
83+
"text": [
84+
"/mnt/code/.pyenv/versions/3.10.12/envs/coast-10/lib/python3.10/site-packages/utide/harmonics.py:16: RuntimeWarning: invalid value encountered in cast\n",
85+
"/mnt/code/.pyenv/versions/3.10.12/envs/coast-10/lib/python3.10/site-packages/utide/harmonics.py:17: RuntimeWarning: invalid value encountered in cast\n"
86+
]
87+
}
88+
],
8089
"source": [
8190
"import coast\n",
8291
"import matplotlib.pyplot as plt\n",
8392
"import datetime\n",
8493
"import numpy as np\n",
8594
"import xarray as xr\n",
95+
"import zarr\n",
8696
"\n",
8797
"root = \"./\"\n",
8898
"fn_config_t_grid = root + \"./config/example_nemo_monthly_climate.json\"\n",
@@ -114,10 +124,21 @@
114124
},
115125
{
116126
"cell_type": "code",
117-
"execution_count": 43,
127+
"execution_count": 2,
118128
"id": "289bbdfd-991c-41ed-9acd-7e9bb35f157c",
119129
"metadata": {},
120-
"outputs": [],
130+
"outputs": [
131+
{
132+
"name": "stderr",
133+
"output_type": "stream",
134+
"text": [
135+
"/tmp/ipykernel_221474/396929176.py:1: RuntimeWarning: Failed to open Zarr store with consolidated metadata, but successfully read with non-consolidated metadata. This is typically much slower for opening a dataset. To silence this warning, consider:\n",
136+
"1. Consolidating metadata in this existing store with zarr.consolidate_metadata().\n",
137+
"2. Explicitly setting consolidated=False, to avoid trying to read consolidate metadata, or\n",
138+
"3. Explicitly setting consolidated=True, to raise an error in this case instead of falling back to try reading non-consolidated metadata.\n"
139+
]
140+
}
141+
],
121142
"source": [
122143
"dom = xr.open_zarr(fn_nemo_dom_mask)\n",
123144
"mesh_zgr = xr.open_zarr(fn_nemo_dom_mesh_zgr)\n",
@@ -126,7 +147,7 @@
126147
},
127148
{
128149
"cell_type": "code",
129-
"execution_count": 44,
150+
"execution_count": 3,
130151
"id": "e1f12c20-4076-4ae0-9135-c95218347805",
131152
"metadata": {},
132153
"outputs": [],
@@ -139,7 +160,7 @@
139160
},
140161
{
141162
"cell_type": "code",
142-
"execution_count": 45,
163+
"execution_count": 4,
143164
"id": "50b2cbb7-a1ad-4ebc-aebb-42a1b8286e58",
144165
"metadata": {},
145166
"outputs": [],

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
PACKAGE = SimpleNamespace(
99
**{
1010
"name": "COAsT",
11-
"version": "3.2.2",
11+
"version": "3.3.0",
1212
"description": "This is the Coast Ocean Assessment Tool",
1313
"long_description": long_description,
1414
"long_description_content_type": "text/markdown",

0 commit comments

Comments
 (0)