Skip to content

Commit 90c0f6f

Browse files
authored
Merge pull request #115 from aodn/UpdatePoetry
Fix github action segmentation fault by pinning poetry version
2 parents 1ffeb0d + f6fe3b2 commit 90c0f6f

File tree

8 files changed

+1886
-1394
lines changed

8 files changed

+1886
-1394
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
virtualenvs-create: true
4141
virtualenvs-in-project: true
4242
installer-parallel: true
43+
version: 2.0.1
4344

4445
#----------------------------------------------
4546
# load cached venv if cache exists

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ jobs:
2424
virtualenvs-create: true
2525
virtualenvs-in-project: true
2626
installer-parallel: true
27+
version: 2.0.1
2728

2829
- name: Clear Poetry Cache
2930
run: |
3031
poetry cache clear pypi --all
3132
3233
- name: Run pre-commit
33-
uses: pre-commit/action@v3.0.0
34+
uses: pre-commit/action@v3.0.1
3435
with:
3536
extra_args: --all-files
3637
hooks: |

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
virtualenvs-create: true
2626
virtualenvs-in-project: true
2727
installer-parallel: true
28+
version: 2.0.1
29+
2830

2931
#----------------------------------------------
3032
# load cached venv if cache exists

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies:
1313
- scipy
1414
- pip<24.1
1515
- pip:
16-
- poetry
16+
- poetry==2.0.1
1717
- -r requirements.txt

notebooks/requirements.txt

Lines changed: 62 additions & 60 deletions
Large diffs are not rendered by default.

poetry.lock

Lines changed: 1784 additions & 1284 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@ colorama = ">=0.4.6"
5151
s3path = ">=0.5.7"
5252
python-levenshtein = "^0.25.1"
5353

54-
[tool.poetry.dev-dependencies]
54+
[tool.poetry.group.dev.dependencies]
55+
poetry = ">=2.0.1"
5556
pytest = "^8.2.1"
5657
ipdb = "^0.13"
5758
ipython = "^7.5.3"
5859
coverage = "^7.5.3"
59-
pre-commit = "^3.7.1"
60+
pre-commit = "^4.0.1"
6061
moto = {version = ">=5.0.0", extras = ["ec2", "s3", "server", "all"]} # Add Moto with optional dependencies
6162
fuzzywuzzy = ">=0.18.0"
6263
sphinx = ">=7.3.7"
63-
poetry-pre-commit-plugin = "^0.1.2"
64+
poetry-pre-commit-plugin = ">=0.2.1"
6465
asciinema = ">=2.4.0" # to record terminal sessions, useful for documentation
6566
matplotlib = "^3.9.1"
6667
cartopy = ">=0.23.0"
@@ -71,6 +72,7 @@ seaborn = ">=0.13.2"
7172
windrose = ">=1.9.2"
7273

7374

75+
7476
#[tool.poetry.extras]
7577
#testing = ["pytest", "ipython", "ipdb"]
7678
#interactive = ["pytest", "ipython", "ipdb"]
@@ -138,22 +140,6 @@ generic_cloud_optimised_creation = "aodn_cloud_optimised.bin.generic_cloud_optim
138140
#[tool.poetry.include]
139141
#data = ["aodn_cloud_optimised/config/*.json", "aodn_cloud_optimised/config/dataset/*.json"]
140142

141-
[tool.poetry.group.dev.dependencies]
142-
pytest = "^8.2.1"
143-
ipdb = "^0.13"
144-
ipython = "^7.5.3"
145-
coverage = "^7.5.3"
146-
pre-commit = "^3.7.1"
147-
moto = {version = ">=5.0.0", extras = ["ec2", "s3", "server", "all"]} # Add Moto with optional dependencies
148-
fuzzywuzzy = ">=0.18.0"
149-
sphinx = ">=7.3.7"
150-
poetry-pre-commit-plugin = "^0.1.2"
151-
asciinema = ">=2.4.0" # to record terminal sessions, useful for documentation
152-
matplotlib = "^3.9.1"
153-
termcolor = "^2.4.0"
154-
nbformat = "^5.10.4"
155-
cartopy = "^0.23.0"
156-
gsw = ">=3.6.19"
157143

158144

159145
[tool.pre_commit]

requirements.txt

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
aiobotocore==2.15.2 ; python_version >= "3.10" and python_version < "4.0"
1+
aiobotocore==2.17.0 ; python_version >= "3.10" and python_version < "4.0"
22
aiohappyeyeballs==2.4.4 ; python_version >= "3.10" and python_version < "4.0"
3-
aiohttp==3.11.10 ; python_version >= "3.10" and python_version < "4.0"
3+
aiohttp==3.11.11 ; python_version >= "3.10" and python_version < "4.0"
44
aioitertools==0.12.0 ; python_version >= "3.10" and python_version < "4.0"
5-
aiosignal==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
6-
anyio==4.7.0 ; python_version >= "3.10" and python_version < "4.0"
5+
aiosignal==1.3.2 ; python_version >= "3.10" and python_version < "4.0"
6+
anyio==4.8.0 ; python_version >= "3.10" and python_version < "4.0"
77
appnope==0.1.4 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "darwin"
88
asciitree==0.3.3 ; python_version >= "3.10" and python_version < "4.0"
99
async-timeout==5.0.1 ; python_version >= "3.10" and python_version < "3.11"
10-
attrs==24.2.0 ; python_version >= "3.10" and python_version < "4.0"
10+
attrs==24.3.0 ; python_version >= "3.10" and python_version < "4.0"
1111
backcall==0.2.0 ; python_version >= "3.10" and python_version < "4.0"
1212
backoff==2.2.1 ; python_version >= "3.10" and python_version < "4.0"
1313
bcrypt==4.2.1 ; python_version >= "3.10" and python_version < "4.0"
1414
bokeh==3.6.2 ; python_version >= "3.10" and python_version < "4.0"
15-
boto3==1.35.36 ; python_version >= "3.10" and python_version < "4.0"
16-
botocore==1.35.36 ; python_version >= "3.10" and python_version < "4.0"
17-
certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0"
15+
boto3==1.35.93 ; python_version >= "3.10" and python_version < "4.0"
16+
botocore==1.35.93 ; python_version >= "3.10" and python_version < "4.0"
17+
certifi==2024.12.14 ; python_version >= "3.10" and python_version < "4.0"
1818
cffi==1.17.1 ; python_version >= "3.10" and python_version < "4.0"
1919
cftime==1.6.4.post1 ; python_version >= "3.10" and python_version < "4.0"
20-
click==8.1.7 ; python_version >= "3.10" and python_version < "4.0"
21-
cloudpickle==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
22-
coiled==1.67.0 ; python_version >= "3.10" and python_version < "4.0"
20+
click==8.1.8 ; python_version >= "3.10" and python_version < "4.0"
21+
cloudpickle==3.1.1 ; python_version >= "3.10" and python_version < "4.0"
22+
coiled==1.71.2 ; python_version >= "3.10" and python_version < "4.0"
2323
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0"
2424
comm==0.2.2 ; python_version >= "3.10" and python_version < "4.0"
2525
contourpy==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
2626
cryptography==44.0.0 ; python_version >= "3.10" and python_version < "4.0"
2727
dask-cloudprovider==2024.9.1 ; python_version >= "3.10" and python_version < "4.0"
28-
dask-expr==1.1.20 ; python_version >= "3.10" and python_version < "4.0"
29-
dask==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
30-
dask[array,diagnostics]==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
28+
dask-expr==1.1.21 ; python_version >= "3.10" and python_version < "4.0"
29+
dask==2024.12.1 ; python_version >= "3.10" and python_version < "4.0"
30+
dask[array,diagnostics]==2024.12.1 ; python_version >= "3.10" and python_version < "4.0"
3131
decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0"
3232
deprecated==1.2.15 ; python_version >= "3.10" and python_version < "4.0"
33-
distributed==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
33+
distributed==2024.12.1 ; python_version >= "3.10" and python_version < "4.0"
3434
exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11"
3535
fabric==3.2.2 ; python_version >= "3.10" and python_version < "4.0"
3636
fasteners==0.19 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "emscripten"
3737
filelock==3.16.1 ; python_version >= "3.10" and python_version < "4.0"
3838
frozenlist==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
39-
fsspec==2024.10.0 ; python_version >= "3.10" and python_version < "4.0"
39+
fsspec==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
4040
geopandas==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
4141
gilknocker==0.4.1 ; python_version >= "3.10" and python_version < "4.0"
4242
h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
@@ -45,15 +45,15 @@ h5netcdf==1.4.1 ; python_version >= "3.10" and python_version < "4.0"
4545
h5py==3.11.0 ; python_version >= "3.10" and python_version < "4.0"
4646
hpack==4.0.0 ; python_version >= "3.10" and python_version < "4.0"
4747
httpcore==1.0.7 ; python_version >= "3.10" and python_version < "4.0"
48-
httpx[http2]==0.28.0 ; python_version >= "3.10" and python_version < "4.0"
48+
httpx[http2]==0.28.1 ; python_version >= "3.10" and python_version < "4.0"
4949
hyperframe==6.0.1 ; python_version >= "3.10" and python_version < "4.0"
5050
idna==3.10 ; python_version >= "3.10" and python_version < "4.0"
5151
importlib-metadata==8.5.0 ; python_version >= "3.10" and python_version < "4.0"
5252
invoke==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
5353
ipython==7.34.0 ; python_version >= "3.10" and python_version < "4.0"
5454
ipywidgets==8.1.5 ; python_version >= "3.10" and python_version < "4.0"
5555
jedi==0.19.2 ; python_version >= "3.10" and python_version < "4.0"
56-
jinja2==3.1.4 ; python_version >= "3.10" and python_version < "4.0"
56+
jinja2==3.1.5 ; python_version >= "3.10" and python_version < "4.0"
5757
jmespath==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
5858
jsondiff==2.2.1 ; python_version >= "3.10" and python_version < "4.0"
5959
jsonschema-specifications==2024.10.1 ; python_version >= "3.10" and python_version < "4.0"
@@ -78,38 +78,38 @@ parso==0.8.4 ; python_version >= "3.10" and python_version < "4.0"
7878
partd==1.4.2 ; python_version >= "3.10" and python_version < "4.0"
7979
pexpect==4.9.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32"
8080
pickleshare==0.7.5 ; python_version >= "3.10" and python_version < "4.0"
81-
pillow==11.0.0 ; python_version >= "3.10" and python_version < "4.0"
81+
pillow==11.1.0 ; python_version >= "3.10" and python_version < "4.0"
8282
pip-requirements-parser==32.0.1 ; python_version >= "3.10" and python_version < "4.0"
8383
pip==24.3.1 ; python_version >= "3.10" and python_version < "4.0"
8484
prometheus-client==0.21.1 ; python_version >= "3.10" and python_version < "4.0"
8585
prompt-toolkit==3.0.48 ; python_version >= "3.10" and python_version < "4.0"
8686
propcache==0.2.1 ; python_version >= "3.10" and python_version < "4.0"
87-
psutil==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
87+
psutil==6.1.1 ; python_version >= "3.10" and python_version < "4.0"
8888
ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32"
8989
pyarrow==17.0.0 ; python_version >= "3.10" and python_version < "4.0"
9090
pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0"
91-
pygments==2.18.0 ; python_version >= "3.10" and python_version < "4.0"
91+
pygments==2.19.1 ; python_version >= "3.10" and python_version < "4.0"
9292
pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
9393
pyogrio==0.10.0 ; python_version >= "3.10" and python_version < "4.0"
94-
pyparsing==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
94+
pyparsing==3.2.1 ; python_version >= "3.10" and python_version < "4.0"
9595
pyproj==3.7.0 ; python_version >= "3.10" and python_version < "4.0"
9696
python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0"
9797
python-levenshtein==0.25.1 ; python_version >= "3.10" and python_version < "4.0"
9898
pytz==2024.2 ; python_version >= "3.10" and python_version < "4.0"
9999
pyyaml==6.0.2 ; python_version >= "3.10" and python_version < "4.0"
100-
rapidfuzz==3.10.1 ; python_version >= "3.10" and python_version < "4.0"
100+
rapidfuzz==3.11.0 ; python_version >= "3.10" and python_version < "4.0"
101101
rechunker==0.5.2 ; python_version >= "3.10" and python_version < "4.0"
102102
referencing==0.35.1 ; python_version >= "3.10" and python_version < "4.0"
103103
rich==13.9.4 ; python_version >= "3.10" and python_version < "4.0"
104104
rpds-py==0.22.3 ; python_version >= "3.10" and python_version < "4.0"
105-
s3fs==2024.10.0 ; python_version >= "3.10" and python_version < "4.0"
105+
s3fs==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
106106
s3path==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
107107
s3transfer==0.10.4 ; python_version >= "3.10" and python_version < "4.0"
108-
scipy==1.14.1 ; python_version >= "3.10" and python_version < "4.0"
109-
setuptools==75.6.0 ; python_version >= "3.10" and python_version < "4.0"
108+
scipy==1.15.1 ; python_version >= "3.10" and python_version < "4.0"
109+
setuptools==75.8.0 ; python_version >= "3.10" and python_version < "4.0"
110110
shapely==2.0.6 ; python_version >= "3.10" and python_version < "4.0"
111111
six==1.17.0 ; python_version >= "3.10" and python_version < "4.0"
112-
smart-open==7.0.5 ; python_version >= "3.10" and python_version < "4.0"
112+
smart-open==7.1.0 ; python_version >= "3.10" and python_version < "4.0"
113113
sniffio==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
114114
sortedcontainers==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
115115
tblib==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
@@ -119,11 +119,11 @@ tornado==6.4.2 ; python_version >= "3.10" and python_version < "4.0"
119119
traitlets==5.14.3 ; python_version >= "3.10" and python_version < "4.0"
120120
typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
121121
tzdata==2024.2 ; python_version >= "3.10" and python_version < "4.0"
122-
urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0"
122+
urllib3==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
123123
wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "4.0"
124124
wheel==0.45.1 ; python_version >= "3.10" and python_version < "4.0"
125125
widgetsnbextension==4.0.13 ; python_version >= "3.10" and python_version < "4.0"
126-
wrapt==1.17.0 ; python_version >= "3.10" and python_version < "4.0"
126+
wrapt==1.17.2 ; python_version >= "3.10" and python_version < "4.0"
127127
xarray[complete]==2024.9.0 ; python_version >= "3.10" and python_version < "4.0"
128128
xyzservices==2024.9.0 ; python_version >= "3.10" and python_version < "4.0"
129129
yarl==1.18.3 ; python_version >= "3.10" and python_version < "4.0"

0 commit comments

Comments
 (0)