Skip to content

Commit

Permalink
Merge pull request #115 from aodn/UpdatePoetry
Browse files Browse the repository at this point in the history
Fix github action segmentation fault by pinning poetry version
  • Loading branch information
lbesnard authored Jan 15, 2025
2 parents 1ffeb0d + f6fe3b2 commit 90c0f6f
Show file tree
Hide file tree
Showing 8 changed files with 1,886 additions and 1,394 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
version: 2.0.1

#----------------------------------------------
# load cached venv if cache exists
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ jobs:
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
version: 2.0.1

- name: Clear Poetry Cache
run: |
poetry cache clear pypi --all
- name: Run pre-commit
uses: pre-commit/[email protected].0
uses: pre-commit/[email protected].1
with:
extra_args: --all-files
hooks: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
virtualenvs-create: true
virtualenvs-in-project: true
installer-parallel: true
version: 2.0.1


#----------------------------------------------
# load cached venv if cache exists
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ dependencies:
- scipy
- pip<24.1
- pip:
- poetry
- poetry==2.0.1
- -r requirements.txt
122 changes: 62 additions & 60 deletions notebooks/requirements.txt

Large diffs are not rendered by default.

3,068 changes: 1,784 additions & 1,284 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 5 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ colorama = ">=0.4.6"
s3path = ">=0.5.7"
python-levenshtein = "^0.25.1"

[tool.poetry.dev-dependencies]
[tool.poetry.group.dev.dependencies]
poetry = ">=2.0.1"
pytest = "^8.2.1"
ipdb = "^0.13"
ipython = "^7.5.3"
coverage = "^7.5.3"
pre-commit = "^3.7.1"
pre-commit = "^4.0.1"
moto = {version = ">=5.0.0", extras = ["ec2", "s3", "server", "all"]} # Add Moto with optional dependencies
fuzzywuzzy = ">=0.18.0"
sphinx = ">=7.3.7"
poetry-pre-commit-plugin = "^0.1.2"
poetry-pre-commit-plugin = ">=0.2.1"
asciinema = ">=2.4.0" # to record terminal sessions, useful for documentation
matplotlib = "^3.9.1"
cartopy = ">=0.23.0"
Expand All @@ -71,6 +72,7 @@ seaborn = ">=0.13.2"
windrose = ">=1.9.2"



#[tool.poetry.extras]
#testing = ["pytest", "ipython", "ipdb"]
#interactive = ["pytest", "ipython", "ipdb"]
Expand Down Expand Up @@ -138,22 +140,6 @@ generic_cloud_optimised_creation = "aodn_cloud_optimised.bin.generic_cloud_optim
#[tool.poetry.include]
#data = ["aodn_cloud_optimised/config/*.json", "aodn_cloud_optimised/config/dataset/*.json"]

[tool.poetry.group.dev.dependencies]
pytest = "^8.2.1"
ipdb = "^0.13"
ipython = "^7.5.3"
coverage = "^7.5.3"
pre-commit = "^3.7.1"
moto = {version = ">=5.0.0", extras = ["ec2", "s3", "server", "all"]} # Add Moto with optional dependencies
fuzzywuzzy = ">=0.18.0"
sphinx = ">=7.3.7"
poetry-pre-commit-plugin = "^0.1.2"
asciinema = ">=2.4.0" # to record terminal sessions, useful for documentation
matplotlib = "^3.9.1"
termcolor = "^2.4.0"
nbformat = "^5.10.4"
cartopy = "^0.23.0"
gsw = ">=3.6.19"


[tool.pre_commit]
Expand Down
58 changes: 29 additions & 29 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
aiobotocore==2.15.2 ; python_version >= "3.10" and python_version < "4.0"
aiobotocore==2.17.0 ; python_version >= "3.10" and python_version < "4.0"
aiohappyeyeballs==2.4.4 ; python_version >= "3.10" and python_version < "4.0"
aiohttp==3.11.10 ; python_version >= "3.10" and python_version < "4.0"
aiohttp==3.11.11 ; python_version >= "3.10" and python_version < "4.0"
aioitertools==0.12.0 ; python_version >= "3.10" and python_version < "4.0"
aiosignal==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
anyio==4.7.0 ; python_version >= "3.10" and python_version < "4.0"
aiosignal==1.3.2 ; python_version >= "3.10" and python_version < "4.0"
anyio==4.8.0 ; python_version >= "3.10" and python_version < "4.0"
appnope==0.1.4 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "darwin"
asciitree==0.3.3 ; python_version >= "3.10" and python_version < "4.0"
async-timeout==5.0.1 ; python_version >= "3.10" and python_version < "3.11"
attrs==24.2.0 ; python_version >= "3.10" and python_version < "4.0"
attrs==24.3.0 ; python_version >= "3.10" and python_version < "4.0"
backcall==0.2.0 ; python_version >= "3.10" and python_version < "4.0"
backoff==2.2.1 ; python_version >= "3.10" and python_version < "4.0"
bcrypt==4.2.1 ; python_version >= "3.10" and python_version < "4.0"
bokeh==3.6.2 ; python_version >= "3.10" and python_version < "4.0"
boto3==1.35.36 ; python_version >= "3.10" and python_version < "4.0"
botocore==1.35.36 ; python_version >= "3.10" and python_version < "4.0"
certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0"
boto3==1.35.93 ; python_version >= "3.10" and python_version < "4.0"
botocore==1.35.93 ; python_version >= "3.10" and python_version < "4.0"
certifi==2024.12.14 ; python_version >= "3.10" and python_version < "4.0"
cffi==1.17.1 ; python_version >= "3.10" and python_version < "4.0"
cftime==1.6.4.post1 ; python_version >= "3.10" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.10" and python_version < "4.0"
cloudpickle==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
coiled==1.67.0 ; python_version >= "3.10" and python_version < "4.0"
click==8.1.8 ; python_version >= "3.10" and python_version < "4.0"
cloudpickle==3.1.1 ; python_version >= "3.10" and python_version < "4.0"
coiled==1.71.2 ; python_version >= "3.10" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0"
comm==0.2.2 ; python_version >= "3.10" and python_version < "4.0"
contourpy==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
cryptography==44.0.0 ; python_version >= "3.10" and python_version < "4.0"
dask-cloudprovider==2024.9.1 ; python_version >= "3.10" and python_version < "4.0"
dask-expr==1.1.20 ; python_version >= "3.10" and python_version < "4.0"
dask==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
dask[array,diagnostics]==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
dask-expr==1.1.21 ; python_version >= "3.10" and python_version < "4.0"
dask==2024.12.1 ; python_version >= "3.10" and python_version < "4.0"
dask[array,diagnostics]==2024.12.1 ; python_version >= "3.10" and python_version < "4.0"
decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0"
deprecated==1.2.15 ; python_version >= "3.10" and python_version < "4.0"
distributed==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
distributed==2024.12.1 ; python_version >= "3.10" and python_version < "4.0"
exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11"
fabric==3.2.2 ; python_version >= "3.10" and python_version < "4.0"
fasteners==0.19 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "emscripten"
filelock==3.16.1 ; python_version >= "3.10" and python_version < "4.0"
frozenlist==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
fsspec==2024.10.0 ; python_version >= "3.10" and python_version < "4.0"
fsspec==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
geopandas==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
gilknocker==0.4.1 ; python_version >= "3.10" and python_version < "4.0"
h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -45,15 +45,15 @@ h5netcdf==1.4.1 ; python_version >= "3.10" and python_version < "4.0"
h5py==3.11.0 ; python_version >= "3.10" and python_version < "4.0"
hpack==4.0.0 ; python_version >= "3.10" and python_version < "4.0"
httpcore==1.0.7 ; python_version >= "3.10" and python_version < "4.0"
httpx[http2]==0.28.0 ; python_version >= "3.10" and python_version < "4.0"
httpx[http2]==0.28.1 ; python_version >= "3.10" and python_version < "4.0"
hyperframe==6.0.1 ; python_version >= "3.10" and python_version < "4.0"
idna==3.10 ; python_version >= "3.10" and python_version < "4.0"
importlib-metadata==8.5.0 ; python_version >= "3.10" and python_version < "4.0"
invoke==2.2.0 ; python_version >= "3.10" and python_version < "4.0"
ipython==7.34.0 ; python_version >= "3.10" and python_version < "4.0"
ipywidgets==8.1.5 ; python_version >= "3.10" and python_version < "4.0"
jedi==0.19.2 ; python_version >= "3.10" and python_version < "4.0"
jinja2==3.1.4 ; python_version >= "3.10" and python_version < "4.0"
jinja2==3.1.5 ; python_version >= "3.10" and python_version < "4.0"
jmespath==1.0.1 ; python_version >= "3.10" and python_version < "4.0"
jsondiff==2.2.1 ; python_version >= "3.10" and python_version < "4.0"
jsonschema-specifications==2024.10.1 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -78,38 +78,38 @@ parso==0.8.4 ; python_version >= "3.10" and python_version < "4.0"
partd==1.4.2 ; python_version >= "3.10" and python_version < "4.0"
pexpect==4.9.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32"
pickleshare==0.7.5 ; python_version >= "3.10" and python_version < "4.0"
pillow==11.0.0 ; python_version >= "3.10" and python_version < "4.0"
pillow==11.1.0 ; python_version >= "3.10" and python_version < "4.0"
pip-requirements-parser==32.0.1 ; python_version >= "3.10" and python_version < "4.0"
pip==24.3.1 ; python_version >= "3.10" and python_version < "4.0"
prometheus-client==0.21.1 ; python_version >= "3.10" and python_version < "4.0"
prompt-toolkit==3.0.48 ; python_version >= "3.10" and python_version < "4.0"
propcache==0.2.1 ; python_version >= "3.10" and python_version < "4.0"
psutil==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
psutil==6.1.1 ; python_version >= "3.10" and python_version < "4.0"
ptyprocess==0.7.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32"
pyarrow==17.0.0 ; python_version >= "3.10" and python_version < "4.0"
pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0"
pygments==2.18.0 ; python_version >= "3.10" and python_version < "4.0"
pygments==2.19.1 ; python_version >= "3.10" and python_version < "4.0"
pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
pyogrio==0.10.0 ; python_version >= "3.10" and python_version < "4.0"
pyparsing==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
pyparsing==3.2.1 ; python_version >= "3.10" and python_version < "4.0"
pyproj==3.7.0 ; python_version >= "3.10" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0"
python-levenshtein==0.25.1 ; python_version >= "3.10" and python_version < "4.0"
pytz==2024.2 ; python_version >= "3.10" and python_version < "4.0"
pyyaml==6.0.2 ; python_version >= "3.10" and python_version < "4.0"
rapidfuzz==3.10.1 ; python_version >= "3.10" and python_version < "4.0"
rapidfuzz==3.11.0 ; python_version >= "3.10" and python_version < "4.0"
rechunker==0.5.2 ; python_version >= "3.10" and python_version < "4.0"
referencing==0.35.1 ; python_version >= "3.10" and python_version < "4.0"
rich==13.9.4 ; python_version >= "3.10" and python_version < "4.0"
rpds-py==0.22.3 ; python_version >= "3.10" and python_version < "4.0"
s3fs==2024.10.0 ; python_version >= "3.10" and python_version < "4.0"
s3fs==2024.12.0 ; python_version >= "3.10" and python_version < "4.0"
s3path==0.6.0 ; python_version >= "3.10" and python_version < "4.0"
s3transfer==0.10.4 ; python_version >= "3.10" and python_version < "4.0"
scipy==1.14.1 ; python_version >= "3.10" and python_version < "4.0"
setuptools==75.6.0 ; python_version >= "3.10" and python_version < "4.0"
scipy==1.15.1 ; python_version >= "3.10" and python_version < "4.0"
setuptools==75.8.0 ; python_version >= "3.10" and python_version < "4.0"
shapely==2.0.6 ; python_version >= "3.10" and python_version < "4.0"
six==1.17.0 ; python_version >= "3.10" and python_version < "4.0"
smart-open==7.0.5 ; python_version >= "3.10" and python_version < "4.0"
smart-open==7.1.0 ; python_version >= "3.10" and python_version < "4.0"
sniffio==1.3.1 ; python_version >= "3.10" and python_version < "4.0"
sortedcontainers==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
tblib==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -119,11 +119,11 @@ tornado==6.4.2 ; python_version >= "3.10" and python_version < "4.0"
traitlets==5.14.3 ; python_version >= "3.10" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
tzdata==2024.2 ; python_version >= "3.10" and python_version < "4.0"
urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0"
urllib3==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
wcwidth==0.2.13 ; python_version >= "3.10" and python_version < "4.0"
wheel==0.45.1 ; python_version >= "3.10" and python_version < "4.0"
widgetsnbextension==4.0.13 ; python_version >= "3.10" and python_version < "4.0"
wrapt==1.17.0 ; python_version >= "3.10" and python_version < "4.0"
wrapt==1.17.2 ; python_version >= "3.10" and python_version < "4.0"
xarray[complete]==2024.9.0 ; python_version >= "3.10" and python_version < "4.0"
xyzservices==2024.9.0 ; python_version >= "3.10" and python_version < "4.0"
yarl==1.18.3 ; python_version >= "3.10" and python_version < "4.0"
Expand Down

0 comments on commit 90c0f6f

Please sign in to comment.