Skip to content

Commit

Permalink
Depend on scippneutron
Browse files Browse the repository at this point in the history
  • Loading branch information
jl-wynen committed Nov 20, 2023
1 parent 3fc9fb2 commit eb91cad
Show file tree
Hide file tree
Showing 10 changed files with 98 additions and 91 deletions.
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dependencies = [
"pythreejs",
"sciline>=23.9.1",
"scipp>=23.8.0",
"scippneutron>=23.9.0",
"scippnexus>=23.9.0",
]

Expand Down
5 changes: 4 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
# Generated by 'tox -e deps', DO NOT EDIT MANUALLY!'
platformdirs<4 # temporary until virtualenv has release with support for this
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
graphviz
plopp
pythreejs
sciline>=23.9.1
scipp>=23.8.0
scippneutron>=23.9.0
scippnexus>=23.9.0
65 changes: 48 additions & 17 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:44c0a039d38ad52a44ddb89b97ea489843399a41
# SHA1:b56f46e481272e54495c65acdf0606088ffc5a10
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -7,25 +7,29 @@
#
asttokens==2.4.1
# via stack-data
backcall==0.2.0
# via ipython
certifi==2023.11.17
# via requests
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via dask
cloudpickle==3.0.0
# via dask
comm==0.2.0
# via ipywidgets
contourpy==1.1.1
contourpy==1.2.0
# via matplotlib
cycler==0.12.1
# via matplotlib
dask==2023.5.0
dask==2023.11.0
# via -r base.in
decorator==5.1.1
# via ipython
exceptiongroup==1.1.3
# via ipython
executing==2.0.1
# via stack-data
fonttools==4.44.1
fonttools==4.44.3
# via matplotlib
fsspec==2023.10.0
# via dask
Expand All @@ -36,12 +40,18 @@ graphlib-backport==1.0.3
graphviz==0.20.1
# via -r base.in
h5py==3.10.0
# via scippnexus
# via
# scippneutron
# scippnexus
idna==3.4
# via requests
importlib-metadata==6.8.0
# via dask
importlib-resources==6.1.1
# via matplotlib
ipydatawidgets==4.3.5
# via pythreejs
ipython==8.12.3
ipython==8.17.2
# via ipywidgets
ipywidgets==8.1.1
# via
Expand All @@ -55,42 +65,48 @@ kiwisolver==1.4.5
# via matplotlib
locket==1.0.0
# via partd
matplotlib==3.7.3
matplotlib==3.8.2
# via plopp
matplotlib-inline==0.1.6
# via ipython
numpy==1.24.4
numpy==1.26.2
# via
# contourpy
# h5py
# ipydatawidgets
# matplotlib
# pythreejs
# scipp
# scippneutron
# scipy
packaging==23.2
# via
# dask
# matplotlib
# pooch
parso==0.8.3
# via jedi
partd==1.4.1
# via dask
pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pillow==10.1.0
# via matplotlib
platformdirs==3.11.0
# via
# -r base.in
# pooch
plopp==23.10.1
# via -r base.in
pooch==1.8.0
# via scippneutron
prompt-toolkit==3.0.41
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.2
# via stack-data
pygments==2.16.1
pygments==2.17.1
# via ipython
pyparsing==3.1.1
# via matplotlib
Expand All @@ -102,16 +118,25 @@ pythreejs==2.4.2
# via -r base.in
pyyaml==6.0.1
# via dask
requests==2.31.0
# via pooch
sciline==23.9.1
# via -r base.in
scipp==23.11.0
# via
# -r base.in
# scippneutron
# scippnexus
scippnexus==23.11.1
scippneutron==23.9.0
# via -r base.in
scipy==1.10.1
# via scippnexus
scippnexus==23.11.1
# via
# -r base.in
# scippneutron
scipy==1.11.4
# via
# scippneutron
# scippnexus
six==1.16.0
# via
# asttokens
Expand All @@ -132,9 +157,15 @@ traitlets==5.13.0
# traittypes
traittypes==0.2.1
# via ipydatawidgets
typing-extensions==4.8.0
# via ipython
urllib3==2.1.0
# via requests
wcwidth==0.2.10
# via prompt-toolkit
widgetsnbextension==4.0.9
# via ipywidgets
zipp==3.17.0
# via importlib-metadata
# via
# importlib-metadata
# importlib-resources
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#
cachetools==5.3.2
# via tox
certifi==2023.7.22
certifi==2023.11.17
# via requests
chardet==5.2.0
# via tox
Expand Down
8 changes: 4 additions & 4 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ json5==0.9.14
# via jupyterlab-server
jsonpointer==2.4
# via jsonschema
jsonschema[format-nongpl]==4.19.2
jsonschema[format-nongpl]==4.20.0
# via
# jupyter-events
# jupyterlab-server
Expand All @@ -41,17 +41,17 @@ jupyter-events==0.9.0
# via jupyter-server
jupyter-lsp==2.2.0
# via jupyterlab
jupyter-server==2.10.0
jupyter-server==2.10.1
# via
# jupyter-lsp
# jupyterlab
# jupyterlab-server
# notebook-shim
jupyter-server-terminals==0.4.4
# via jupyter-server
jupyterlab==4.0.8
jupyterlab==4.0.9
# via -r dev.in
jupyterlab-server==2.25.1
jupyterlab-server==2.25.2
# via jupyterlab
notebook-shim==0.2.3
# via jupyterlab
Expand Down
64 changes: 18 additions & 46 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:894ae0768d7baa8f604a6d257c02840e43ca2f74
# SHA1:29455914eb25d3d8b9873b30f928efd76745ad2b
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -10,14 +10,10 @@ accessible-pygments==0.0.4
# via pydata-sphinx-theme
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via pydantic
attrs==23.1.0
# via
# jsonschema
# referencing
autodoc-pydantic==2.0.1
# via -r docs.in
babel==2.13.1
# via
# pydata-sphinx-theme
Expand All @@ -28,10 +24,6 @@ beautifulsoup4==4.12.2
# pydata-sphinx-theme
bleach==6.1.0
# via nbconvert
certifi==2023.7.22
# via requests
charset-normalizer==3.3.2
# via requests
debugpy==1.8.0
# via ipykernel
defusedxml==0.7.1
Expand All @@ -42,10 +34,8 @@ docutils==0.20.1
# nbsphinx
# pydata-sphinx-theme
# sphinx
fastjsonschema==2.18.1
fastjsonschema==2.19.0
# via nbformat
idna==3.4
# via requests
imagesize==1.4.1
# via sphinx
ipykernel==6.26.0
Expand All @@ -56,9 +46,9 @@ jinja2==3.1.2
# nbconvert
# nbsphinx
# sphinx
jsonschema==4.19.2
jsonschema==4.20.0
# via nbformat
jsonschema-specifications==2023.7.1
jsonschema-specifications==2023.11.1
# via jsonschema
jupyter-client==8.6.0
# via
Expand Down Expand Up @@ -104,82 +94,64 @@ nest-asyncio==1.5.8
# via ipykernel
pandocfilters==1.5.0
# via nbconvert
pkgutil-resolve-name==1.3.10
# via jsonschema
platformdirs==3.11.0
# via
# -r docs.in
# jupyter-core
psutil==5.9.6
# via ipykernel
pydantic==2.5.0
# via
# autodoc-pydantic
# pydantic-settings
pydantic-core==2.14.1
# via pydantic
pydantic-settings==2.1.0
# via autodoc-pydantic
pydata-sphinx-theme==0.14.3
# via -r docs.in
python-dotenv==1.0.0
# via pydantic-settings
pytz==2023.3.post1
# via babel
pyzmq==25.1.1
# via
# ipykernel
# jupyter-client
referencing==0.30.2
referencing==0.31.0
# via
# jsonschema
# jsonschema-specifications
requests==2.31.0
# via sphinx
rpds-py==0.12.0
rpds-py==0.13.0
# via
# jsonschema
# referencing
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
# via beautifulsoup4
sphinx==7.1.2
sphinx==7.2.6
# via
# -r docs.in
# autodoc-pydantic
# myst-parser
# nbsphinx
# pydata-sphinx-theme
# sphinx-autodoc-typehints
# sphinx-copybutton
# sphinx-design
sphinx-autodoc-typehints==1.23.0
# sphinxcontrib-applehelp
# sphinxcontrib-devhelp
# sphinxcontrib-htmlhelp
# sphinxcontrib-qthelp
# sphinxcontrib-serializinghtml
sphinx-autodoc-typehints==1.25.2
# via -r docs.in
sphinx-copybutton==0.5.2
# via -r docs.in
sphinx-design==0.5.0
# via -r docs.in
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-applehelp==1.0.7
# via sphinx
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-devhelp==1.0.5
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-htmlhelp==2.0.4
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-qthelp==1.0.6
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==1.1.9
# via sphinx
tinycss2==1.2.1
# via nbconvert
tornado==6.3.3
# via
# ipykernel
# jupyter-client
urllib3==2.1.0
# via requests
webencodings==0.5.1
# via
# bleach
Expand Down
6 changes: 4 additions & 2 deletions requirements/nightly.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Generated by 'tox -e deps', DO NOT EDIT MANUALLY!'
platformdirs<4 # temporary until virtualenv has release with support for this
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
graphviz
pythreejs
https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp38-cp38-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
scippnexus @ git+https://github.com/scipp/scippnexus@main
sciline @ git+https://github.com/scipp/sciline@main
plopp @ git+https://github.com/scipp/plopp@main
Expand Down
Loading

0 comments on commit eb91cad

Please sign in to comment.