Skip to content

Commit

Permalink
Merge pull request #89 from oceanhackweek/24-Myranda-xarray-pin
Browse files Browse the repository at this point in the history
Pin xarray to less than 2024.3 for argopy
  • Loading branch information
abkfenris authored Aug 27, 2024
2 parents e18dea3 + 410894f commit e5901d6
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 73 deletions.
140 changes: 69 additions & 71 deletions py-base/pixi.lock
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/linux-64/numba-0.60.0-py312h83e6fd3_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numbagg-0.8.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/numcodecs-0.12.1-py312h7070661_1.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-2.0.1-py312h1103770_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numpy_groupies-0.11.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.2-h488ebb8_0.conda
Expand Down Expand Up @@ -509,7 +509,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/noarch/wheel-0.44.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.11-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/wrapt-1.16.0-py312h98912ed_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.7.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.2.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/xcb-util-0.4.1-hb711507_2.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/xcb-util-cursor-0.1.4-h4ab18f5_2.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/xcb-util-image-0.4.0-hb711507_2.conda
Expand Down Expand Up @@ -894,7 +894,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/numba-0.60.0-py312h638656a_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numbagg-0.8.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/numcodecs-0.12.1-py312h7f10901_1.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/numpy-2.0.1-py312hd0593b1_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/numpy-1.26.4-py312h470d778_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numpy_groupies-0.11.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/openjpeg-2.5.2-h0d9d63b_0.conda
Expand Down Expand Up @@ -1047,7 +1047,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/noarch/wheel-0.44.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.11-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/wrapt-1.16.0-py312hdd3e373_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.7.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.2.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/xcb-util-0.4.1-h5c728e9_2.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/xcb-util-cursor-0.1.4-h68df207_2.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/xcb-util-image-0.4.0-h5c728e9_2.conda
Expand Down Expand Up @@ -1413,7 +1413,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/osx-64/numba-0.60.0-py312hc3b515d_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numbagg-0.8.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/numcodecs-0.12.1-py312h28f332c_1.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/numpy-2.0.1-py312h8813227_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/numpy-1.26.4-py312he3a82b2_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numpy_groupies-0.11.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/osx-64/openjpeg-2.5.2-h7310d3a_0.conda
Expand Down Expand Up @@ -1565,7 +1565,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/noarch/wheel-0.44.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.11-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/wrapt-1.16.0-py312h41838bb_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.7.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.2.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-64/xerces-c-3.2.5-hbbe9ea5_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xoak-0.1.1-pyhd8ed1ab_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/osx-64/xorg-libxau-1.0.11-h0dc2134_0.conda
Expand Down Expand Up @@ -1909,7 +1909,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/numba-0.60.0-py312h41cea2d_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numbagg-0.8.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/numcodecs-0.12.1-py312h5c2e7bc_1.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/numpy-2.0.1-py312hb544834_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/numpy-1.26.4-py312h8442bc7_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/numpy_groupies-0.11.1-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/oauthlib-3.2.2-pyhd8ed1ab_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/openjpeg-2.5.2-h9f1df11_0.conda
Expand Down Expand Up @@ -2060,7 +2060,7 @@ environments:
- conda: https://conda.anaconda.org/conda-forge/noarch/wheel-0.44.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-4.0.11-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/wrapt-1.16.0-py312he37b823_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.7.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.2.0-pyhd8ed1ab_0.conda
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/xerces-c-3.2.5-hf393695_0.conda
- conda: https://conda.anaconda.org/conda-forge/noarch/xoak-0.1.1-pyhd8ed1ab_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/osx-arm64/xorg-libxau-1.0.11-hb547adb_0.conda
Expand Down Expand Up @@ -17751,95 +17751,92 @@ packages:
timestamp: 1715219145296
- kind: conda
name: numpy
version: 2.0.1
build: py312h1103770_0
subdir: linux-64
url: https://conda.anaconda.org/conda-forge/linux-64/numpy-2.0.1-py312h1103770_0.conda
sha256: 0746a37d09036b4164ac14dd1328dd4e449a038383aac1e25e2d5f3a691518da
md5: 9f444595d8d9682891f2f078fc19da43
version: 1.26.4
build: py312h470d778_0
subdir: linux-aarch64
url: https://conda.anaconda.org/conda-forge/linux-aarch64/numpy-1.26.4-py312h470d778_0.conda
sha256: 23767677a7790bee5457d5e75ebd508b9a31c5354216f4310dd1acfca3f7a6f9
md5: 9cebf5a06cb87d4569cd68df887af476
depends:
- __glibc >=2.17,<3.0.a0
- libblas >=3.9.0,<4.0a0
- libcblas >=3.9.0,<4.0a0
- libgcc-ng >=12
- liblapack >=3.9.0,<4.0a0
- libstdcxx-ng >=12
- python >=3.12,<3.13.0a0
- python >=3.12,<3.13.0a0 *_cpython
- python_abi 3.12.* *_cp312
constrains:
- numpy-base <0a0
license: BSD-3-Clause
license_family: BSD
size: 8345605
timestamp: 1721966364929
size: 6614296
timestamp: 1707225994762
- kind: conda
name: numpy
version: 2.0.1
build: py312h8813227_0
subdir: osx-64
url: https://conda.anaconda.org/conda-forge/osx-64/numpy-2.0.1-py312h8813227_0.conda
sha256: 3f73ed4464e3dc639c875b6cbe86e8095f88afe047bdfdc3d4b4ae120dd830e8
md5: 7f239fbf9d9355f86529a35af0b24d29
version: 1.26.4
build: py312h8442bc7_0
subdir: osx-arm64
url: https://conda.anaconda.org/conda-forge/osx-arm64/numpy-1.26.4-py312h8442bc7_0.conda
sha256: c8841d6d6f61fd70ca80682efbab6bdb8606dc77c68d8acabfbd7c222054f518
md5: d83fc83d589e2625a3451c9a7e21047c
depends:
- __osx >=10.13
- libblas >=3.9.0,<4.0a0
- libcblas >=3.9.0,<4.0a0
- libcxx >=16
- liblapack >=3.9.0,<4.0a0
- python >=3.12,<3.13.0a0
- python >=3.12,<3.13.0a0 *_cpython
- python_abi 3.12.* *_cp312
constrains:
- numpy-base <0a0
license: BSD-3-Clause
license_family: BSD
size: 7464264
timestamp: 1721966235928
size: 6073136
timestamp: 1707226249608
- kind: conda
name: numpy
version: 2.0.1
build: py312hb544834_0
subdir: osx-arm64
url: https://conda.anaconda.org/conda-forge/osx-arm64/numpy-2.0.1-py312hb544834_0.conda
sha256: 943ede4dc872c8f8b7d92a71b843b445f46ebf084047f5816554646d763aa50d
md5: c386f6ee0329c18d652e30b9722c6660
version: 1.26.4
build: py312he3a82b2_0
subdir: osx-64
url: https://conda.anaconda.org/conda-forge/osx-64/numpy-1.26.4-py312he3a82b2_0.conda
sha256: 6152b73fba3e227afa4952df8753128fc9669bbaf142ee8f9972bf9df3bf8856
md5: 96c61a21c4276613748dba069554846b
depends:
- __osx >=11.0
- libblas >=3.9.0,<4.0a0
- libcblas >=3.9.0,<4.0a0
- libcxx >=16
- liblapack >=3.9.0,<4.0a0
- python >=3.12,<3.13.0a0
- python >=3.12,<3.13.0a0 *_cpython
- python_abi 3.12.* *_cp312
constrains:
- numpy-base <0a0
license: BSD-3-Clause
license_family: BSD
size: 6294877
timestamp: 1721966342039
size: 6990646
timestamp: 1707226178262
- kind: conda
name: numpy
version: 2.0.1
build: py312hd0593b1_0
subdir: linux-aarch64
url: https://conda.anaconda.org/conda-forge/linux-aarch64/numpy-2.0.1-py312hd0593b1_0.conda
sha256: e40b98a3f5646a657327f2e235d7216d16482fae30f073e1024a69dbc8024f7e
md5: 7d35f990473581b44a49b4846b649bfd
version: 1.26.4
build: py312heda63a1_0
subdir: linux-64
url: https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.4-py312heda63a1_0.conda
sha256: fe3459c75cf84dcef6ef14efcc4adb0ade66038ddd27cadb894f34f4797687d8
md5: d8285bea2a350f63fab23bf460221f3f
depends:
- libblas >=3.9.0,<4.0a0
- libcblas >=3.9.0,<4.0a0
- libgcc-ng >=12
- liblapack >=3.9.0,<4.0a0
- libstdcxx-ng >=12
- python >=3.12,<3.13.0a0
- python >=3.12,<3.13.0a0 *_cpython
- python_abi 3.12.* *_cp312
constrains:
- numpy-base <0a0
license: BSD-3-Clause
license_family: BSD
size: 7134671
timestamp: 1721966364147
size: 7484186
timestamp: 1707225809722
- kind: conda
name: numpy_groupies
version: 0.11.1
Expand Down Expand Up @@ -23816,42 +23813,43 @@ packages:
timestamp: 1699533197501
- kind: conda
name: xarray
version: 2024.7.0
version: 2024.2.0
build: pyhd8ed1ab_0
subdir: noarch
noarch: python
url: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.7.0-pyhd8ed1ab_0.conda
sha256: c8a0c70bb3402b29a9eebb1e41c5d28e9215bb14abea0c986d4d89026aa1ce42
md5: a7d4ff4bf1502eaba3fbbaeba66969ec
url: https://conda.anaconda.org/conda-forge/noarch/xarray-2024.2.0-pyhd8ed1ab_0.conda
sha256: 4b0a8143f5c501246214823fe543e9d0749c950fdbdd39de6d8cd6209da2259f
md5: 8e25aab3323476d4fd0b5f6bad05d403
depends:
- numpy >=1.23
- packaging >=23.1
- pandas >=2.0
- numpy >=1.23,<2.0a0
- packaging >=22
- pandas >=1.5
- python >=3.9
constrains:
- dask-core >=2023.4
- hdf5 >=1.12
- bottleneck >=1.3
- numba >=0.56
- h5py >=3.8
- h5netcdf >=1.1
- iris >=3.4
- sparse >=0.14
- matplotlib-base >=3.7
- toolz >=0.12
- distributed >=2023.4
- seaborn >=0.12
- zarr >=2.14
- h5py >=3.6
- zarr >=2.12
- h5netcdf >=1.0
- cftime >=1.6
- pint >=0.22
- netcdf4 >=1.6.0
- distributed >=2022.7
- matplotlib-base >=3.5
- flox >=0.5
- numba >=0.55
- scipy >=1.8
- nc-time-axis >=1.4
- scipy >=1.10
- cartopy >=0.21
- flox >=0.7
- pint >=0.19
- toolz >=0.12
- netcdf4 >=1.6.0
- seaborn >=0.11
- hdf5 >=1.12
- dask-core >=2022.7
- sparse >=0.13
- cartopy >=0.20
- iris >=3.2
license: Apache-2.0
size: 791540
timestamp: 1722348308549
license_family: APACHE
size: 741597
timestamp: 1708349308763
- kind: conda
name: xcb-util
version: 0.4.1
Expand Down
5 changes: 3 additions & 2 deletions py-base/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ pytorch = ">=2.3.1,<2.4"
torchvision = ">=0.18.1,<0.19"
einops = ">=0.8.0,<0.9"
matplotlib = ">=3.9.1,<3.10"
numpy = ">=2.0.1,<2.1"
numpy = "*"

[feature.24-Ciara.dependencies]
cfgrib = ">=0.9.14.0"
Expand All @@ -66,7 +66,7 @@ ipykernel = ">=6.29.5"
numpy = ">=1.24.3"
matplotlib = ">=3.9.1"
pandas = ">=2.2.2"
xarray = ">=2024.1.0"
xarray = "*"
cartopy = ">=0.22.0"
boto3 = "*"
# botocore = ">=1.34.78"
Expand Down Expand Up @@ -98,6 +98,7 @@ matplotlib = "*"
pandas = "*"
scikit-learn = "*"
numpy = "*"
xarray = "<2024.3"


[environments]
Expand Down

0 comments on commit e5901d6

Please sign in to comment.