Skip to content

Commit

Permalink
Merge branch 'master' into uname
Browse files Browse the repository at this point in the history
  • Loading branch information
scottyhq authored Jun 26, 2024
2 parents 9d2802e + b5d9294 commit 0db80af
Show file tree
Hide file tree
Showing 15 changed files with 6,529 additions and 6,236 deletions.
202 changes: 105 additions & 97 deletions base-notebook/conda-linux-64.lock

Large diffs are not rendered by default.

968 changes: 546 additions & 422 deletions base-notebook/conda-lock.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions base-notebook/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ channels:
- conda-forge
- nodefaults
dependencies:
- python=3.11
- pangeo-notebook=2024.06.02
- python=3.12
- pangeo-notebook=2024.06.21
- pip
100 changes: 54 additions & 46 deletions base-notebook/packages.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ aiohttp==3.9.5
aiosignal==1.3.1
alembic==1.13.1
annotated-types==0.7.0
anyio==4.3.0
anyio==4.4.0
argon2-cffi==23.1.0
argon2-cffi-bindings==21.2.0
arrow==1.3.0
Expand All @@ -15,18 +15,23 @@ async-lru==2.0.4
async_generator==1.10
attrs==23.2.0
aws-c-auth==0.7.22
aws-c-cal==0.6.14
aws-c-cal==0.6.15
aws-c-common==0.9.19
aws-c-compression==0.2.18
aws-c-event-stream==0.4.2
aws-c-http==0.8.1
aws-c-io==0.14.8
aws-c-http==0.8.2
aws-c-io==0.14.9
aws-c-mqtt==0.10.4
aws-c-s3==0.5.9
aws-c-s3==0.5.10
aws-c-sdkutils==0.1.16
aws-checksums==0.1.18
aws-crt-cpp==0.26.9
aws-crt-cpp==0.26.12
aws-sdk-cpp==1.11.329
azure-core-cpp==1.12.0
azure-identity-cpp==1.8.0
azure-storage-blobs-cpp==12.11.0
azure-storage-common-cpp==12.6.0
azure-storage-files-datalake-cpp==12.10.0
babel==2.14.0
beautifulsoup4==4.12.3
bleach==6.1.0
Expand All @@ -38,66 +43,67 @@ c-ares==1.28.1
ca-certificates==2024.6.2
cached-property==1.5.2
cached_property==1.5.2
certifi==2024.2.2
certifi==2024.6.2
certipy==0.1.3
cffi==1.16.0
charset-normalizer==3.3.2
click==8.1.7
cloudpickle==3.0.0
comm==0.2.2
contourpy==1.2.1
cryptography==42.0.7
cryptography==42.0.8
cytoolz==0.12.3
dask==2024.5.2
dask-core==2024.5.2
dask-expr==1.1.2
dask==2024.6.2
dask-core==2024.6.2
dask-expr==1.1.6
dask-gateway==2024.1.0
dask-labextension==7.0.0
debugpy==1.8.1
decorator==5.1.1
defusedxml==0.7.1
distributed==2024.5.2
distributed==2024.6.2
entrypoints==0.4
exceptiongroup==1.2.0
executing==2.0.1
fqdn==1.5.1
freetype==2.12.1
frozenlist==1.4.1
fsspec==2024.5.0
fsspec==2024.6.0
gflags==2.2.2
glog==0.7.0
glog==0.7.1
greenlet==3.0.3
h11==0.14.0
h2==4.1.0
hpack==4.0.0
httpcore==1.0.5
httpx==0.27.0
hyperframe==6.0.1
icu==73.2
idna==3.7
importlib-metadata==7.1.0
importlib_metadata==7.1.0
importlib-metadata==7.2.1
importlib_metadata==7.2.1
importlib_resources==6.4.0
ipykernel==6.29.3
ipykernel==6.29.4
ipython==8.25.0
ipywidgets==8.1.3
isoduration==20.11.0
jedi==0.19.1
jinja2==3.1.4
json5==0.9.25
jsonpointer==2.4
jsonpointer==3.0.0
jsonschema==4.22.0
jsonschema-specifications==2023.12.1
jsonschema-with-format-nongpl==4.22.0
jupyter-lsp==2.2.5
jupyter-server-proxy==4.1.2
jupyter-server-proxy==4.2.0
jupyter_client==8.6.2
jupyter_core==5.7.2
jupyter_events==0.10.0
jupyter_server==2.14.1
jupyter_server_terminals==0.5.3
jupyterhub-base==5.0.0
jupyterhub-singleuser==5.0.0
jupyterlab==4.2.1
jupyterlab==4.2.2
jupyterlab_pygments==0.3.0
jupyterlab_server==2.27.2
jupyterlab_widgets==3.0.11
Expand Down Expand Up @@ -128,9 +134,10 @@ libgcc-ng==13.2.0
libgfortran-ng==13.2.0
libgfortran5==13.2.0
libgomp==13.2.0
libgoogle-cloud==2.24.0
libgoogle-cloud-storage==2.24.0
libgoogle-cloud==2.25.0
libgoogle-cloud-storage==2.25.0
libgrpc==1.62.2
libiconv==1.17
libjpeg-turbo==3.0.0
liblapack==3.9.0
libnghttp2==1.58.0
Expand All @@ -141,16 +148,17 @@ libpng==1.6.43
libprotobuf==4.25.3
libre2-11==2023.09.01
libsodium==1.0.18
libsqlite==3.45.3
libsqlite==3.46.0
libssh2==1.11.0
libstdcxx-ng==13.2.0
libthrift==0.19.0
libtiff==4.6.0
libutf8proc==2.8.0
libuuid==2.38.1
libwebp-base==1.4.0
libxcb==1.15
libxcb==1.16
libxcrypt==4.4.36
libxml2==2.12.7
libzlib==1.3.1
locket==1.0.0
lz4==4.3.3
Expand All @@ -167,20 +175,20 @@ nbformat==5.10.4
nbgitpuller==1.2.1
ncurses==6.5
nest-asyncio==1.6.0
notebook==7.2.0
notebook==7.2.1
notebook-shim==0.2.4
numpy==1.26.4
numpy==2.0.0
oauthlib==3.2.2
openjpeg==2.5.2
openssl==3.3.0
openssl==3.3.1
orc==2.0.1
overrides==7.7.0
packaging==24.0
packaging==24.1
pamela==1.1.0
pandas==2.2.2
pandocfilters==1.5.0
pangeo-dask==2024.06.02
pangeo-notebook==2024.06.02
pangeo-dask==2024.06.21
pangeo-notebook==2024.06.21
parso==0.8.4
partd==1.4.2
pexpect==4.9.0
Expand All @@ -190,7 +198,7 @@ pip==24.0
pkgutil-resolve-name==1.3.10
platformdirs==4.2.2
prometheus_client==0.20.0
prompt-toolkit==3.0.42
prompt-toolkit==3.0.47
psutil==5.9.8
pthread-stubs==0.4
ptyprocess==0.7.0
Expand All @@ -199,18 +207,18 @@ pyarrow==16.1.0
pyarrow-core==16.1.0
pyarrow-hotfix==0.6
pycparser==2.22
pydantic==2.7.2
pydantic-core==2.18.3
pydantic==2.7.4
pydantic-core==2.18.4
pygments==2.18.0
pyjwt==2.8.0
pyopenssl==24.0.0
pysocks==1.7.1
python==3.11.9
python==3.12.4
python-dateutil==2.9.0
python-fastjsonschema==2.19.1
python-fastjsonschema==2.20.0
python-json-logger==2.0.7
python-tzdata==2024.1
python_abi==3.11
python_abi==3.12
pytz==2024.1
pyyaml==6.0.1
pyzmq==26.0.3
Expand All @@ -221,45 +229,45 @@ requests==2.32.3
rfc3339-validator==0.1.4
rfc3986-validator==0.1.1
rpds-py==0.18.1
s2n==1.4.15
s2n==1.4.16
send2trash==1.8.3
setuptools==70.0.0
setuptools==70.1.0
simpervisor==1.0.0
six==1.16.0
snappy==1.2.0
sniffio==1.3.1
sortedcontainers==2.4.0
soupsieve==2.5
sqlalchemy==2.0.30
sqlalchemy==2.0.31
stack_data==0.6.2
tblib==3.0.0
terminado==0.18.1
tinycss2==1.3.0
tk==8.6.13
tomli==2.0.1
toolz==0.12.1
tornado==6.4
tornado==6.4.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20240316
typing-extensions==4.12.1
typing_extensions==4.12.1
typing-extensions==4.12.2
typing_extensions==4.12.2
typing_utils==0.1.0
tzdata==2024a
uri-template==1.3.0
urllib3==2.2.1
urllib3==2.2.2
wcwidth==0.2.13
webcolors==1.13
webcolors==24.6.0
webencodings==0.5.1
websocket-client==1.8.0
wheel==0.43.0
widgetsnbextension==4.0.11
xorg-libxau==1.0.11
xorg-libxdmcp==1.1.3
xyzservices==2024.4.0
xyzservices==2024.6.0
xz==5.2.6
yaml==0.2.5
yarl==1.9.4
zeromq==4.3.5
zict==3.0.0
zipp==3.17.0
zipp==3.19.2
zstd==1.5.6
2 changes: 1 addition & 1 deletion environment-condalock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: condalock
channels:
- conda-forge
dependencies:
- python=3.11
- python=3.12
- conda-lock>=2.5
- conda>=24.5.0
- mamba=1
Loading

0 comments on commit 0db80af

Please sign in to comment.