Skip to content

Commit

Permalink
Merge pull request #200 from scipp/revert-ci-deps
Browse files Browse the repository at this point in the history
Revert CI deps to Python 3.9
  • Loading branch information
SimonHeybrock committed Mar 5, 2024
2 parents 36c8b74 + d0c656a commit 6e4e566
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 27 deletions.
2 changes: 1 addition & 1 deletion requirements/base.in
Expand Up @@ -6,6 +6,6 @@ ipython==8.9.0
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
python-dateutil
scipp>=23.07.0
scipp>=24.02.0
scipy
h5py
4 changes: 2 additions & 2 deletions requirements/base.txt
@@ -1,4 +1,4 @@
# SHA1:a15afedb603f3f93254301541bc458dd5bb1b465
# SHA1:f5405f402487ff3e690982f433b2af29f97f4481
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand Down Expand Up @@ -42,7 +42,7 @@ pure-eval==0.2.2
# via stack-data
pygments==2.17.2
# via ipython
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via -r base.in
scipp==24.2.0
# via -r base.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/basetest.txt
Expand Up @@ -13,7 +13,7 @@ packaging==23.2
# via pytest
pluggy==1.4.0
# via pytest
pytest==8.0.1
pytest==8.0.2
# via -r basetest.in
tomli==2.0.1
# via pytest
4 changes: 2 additions & 2 deletions requirements/ci.txt
Expand Up @@ -5,7 +5,7 @@
#
# pip-compile-multi
#
cachetools==5.3.2
cachetools==5.3.3
# via tox
certifi==2024.2.2
# via requests
Expand Down Expand Up @@ -52,5 +52,5 @@ tox==4.13.0
# via -r ci.in
urllib3==2.2.1
# via requests
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
18 changes: 9 additions & 9 deletions requirements/dev.txt
Expand Up @@ -42,15 +42,15 @@ funcy==2.0
# via copier
h11==0.14.0
# via httpcore
httpcore==1.0.3
httpcore==1.0.4
# via httpx
httpx==0.26.0
httpx==0.27.0
# via jupyterlab
isoduration==20.11.0
# via jsonschema
jinja2-ansible-filters==1.3.2
# via copier
json5==0.9.14
json5==0.9.20
# via jupyterlab-server
jsonpointer==2.4
# via jsonschema
Expand All @@ -61,17 +61,17 @@ jsonschema[format-nongpl]==4.21.1
# nbformat
jupyter-events==0.9.0
# via jupyter-server
jupyter-lsp==2.2.2
jupyter-lsp==2.2.3
# via jupyterlab
jupyter-server==2.12.5
jupyter-server==2.13.0
# via
# jupyter-lsp
# jupyterlab
# jupyterlab-server
# notebook-shim
jupyter-server-terminals==0.5.2
# via jupyter-server
jupyterlab==4.1.1
jupyterlab==4.1.3
# via -r dev.in
jupyterlab-server==2.25.3
# via jupyterlab
Expand All @@ -91,9 +91,9 @@ prometheus-client==0.20.0
# via jupyter-server
pycparser==2.21
# via cffi
pydantic==2.6.1
pydantic==2.6.3
# via copier
pydantic-core==2.16.2
pydantic-core==2.16.3
# via pydantic
python-json-logger==2.0.7
# via jupyter-events
Expand All @@ -111,7 +111,7 @@ rfc3986-validator==0.1.1
# jupyter-events
send2trash==1.8.2
# via jupyter-server
sniffio==1.3.0
sniffio==1.3.1
# via
# anyio
# httpx
Expand Down
21 changes: 16 additions & 5 deletions requirements/docs.txt
Expand Up @@ -52,7 +52,14 @@ idna==3.6
# via requests
imagesize==1.4.1
# via sphinx
ipykernel==6.29.2
importlib-metadata==7.0.1
# via
# jupyter-client
# nbconvert
# sphinx
importlib-resources==6.1.2
# via matplotlib
ipykernel==6.29.3
# via -r docs.in
jinja2==3.1.3
# via
Expand Down Expand Up @@ -101,7 +108,7 @@ myst-parser==2.0.0
# via -r docs.in
nbclient==0.9.0
# via nbconvert
nbconvert==7.16.0
nbconvert==7.16.2
# via nbsphinx
nbformat==5.9.2
# via
Expand All @@ -128,9 +135,9 @@ platformdirs==4.2.0
# via
# jupyter-core
# pooch
plopp==24.1.1
plopp==24.2.0
# via -r docs.in
pooch==1.8.0
pooch==1.8.1
# via -r docs.in
psutil==5.9.8
# via ipykernel
Expand Down Expand Up @@ -193,11 +200,15 @@ tornado==6.4
# via
# ipykernel
# jupyter-client
typing-extensions==4.9.0
typing-extensions==4.10.0
# via pydata-sphinx-theme
urllib3==2.2.1
# via requests
webencodings==0.5.1
# via
# bleach
# tinycss2
zipp==3.17.0
# via
# importlib-metadata
# importlib-resources
2 changes: 1 addition & 1 deletion requirements/mypy.txt
Expand Up @@ -10,5 +10,5 @@ mypy==1.8.0
# via -r mypy.in
mypy-extensions==1.0.0
# via mypy
typing-extensions==4.9.0
typing-extensions==4.10.0
# via mypy
2 changes: 1 addition & 1 deletion requirements/nightly.in
Expand Up @@ -4,4 +4,4 @@
python-dateutil
scipy
h5py
https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
6 changes: 3 additions & 3 deletions requirements/nightly.txt
@@ -1,4 +1,4 @@
# SHA1:6cffc86dc2938853053dd653f44046481a5e0580
# SHA1:799a1fd7b9563a4277cadc6e4fc5fad5039cad2c
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -13,9 +13,9 @@ numpy==1.26.4
# h5py
# scipp
# scipy
python-dateutil==2.8.2
python-dateutil==2.9.0.post0
# via -r nightly.in
scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
# via -r nightly.in
scipy==1.12.0
# via -r nightly.in
Expand Down
2 changes: 1 addition & 1 deletion requirements/static.txt
Expand Up @@ -21,7 +21,7 @@ pre-commit==3.6.2
# via -r static.in
pyyaml==6.0.1
# via pre-commit
virtualenv==20.25.0
virtualenv==20.25.1
# via pre-commit

# The following packages are considered to be unsafe in a requirements file:
Expand Down
6 changes: 5 additions & 1 deletion requirements/wheels.txt
Expand Up @@ -5,8 +5,10 @@
#
# pip-compile-multi
#
build==1.0.3
build==1.1.1
# via -r wheels.in
importlib-metadata==7.0.1
# via build
packaging==23.2
# via build
pyproject-hooks==1.0.0
Expand All @@ -15,3 +17,5 @@ tomli==2.0.1
# via
# build
# pyproject-hooks
zipp==3.17.0
# via importlib-metadata

0 comments on commit 6e4e566

Please sign in to comment.