Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user-guide/dream/dream-data-reduction.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"source": [
"workflow[Filename[SampleRun]] = dream.data.simulated_diamond_sample()\n",
"workflow[Filename[VanadiumRun]] = dream.data.simulated_vanadium_sample()\n",
"workflow[Filename[EmptyCanRun]] = dream.data.simulated_empty_can()\n",
"workflow[Filename[BackgroundRun]] = dream.data.simulated_empty_can()\n",
"workflow[CalibrationFilename] = None\n",
"workflow[NeXusDetectorName] = \"mantle\"\n",
"# The upper bounds mode is not yet implemented.\n",
Expand Down
4 changes: 2 additions & 2 deletions docs/user-guide/sns-instruments/POWGEN_data_reduction.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"source": [
"results = workflow.compute(\n",
" (\n",
" ReducibleDetectorData[SampleRun],\n",
" DetectorData[SampleRun],\n",
" MaskedData[SampleRun],\n",
" FilteredData[SampleRun],\n",
" FilteredData[VanadiumRun],\n",
Expand All @@ -254,7 +254,7 @@
"metadata": {},
"outputs": [],
"source": [
"results[ReducibleDetectorData[SampleRun]]"
"results[DetectorData[SampleRun]]"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ requires-python = ">=3.10"
# Make sure to list one dependency per line.
dependencies = [
"dask",
"essreduce>=24.07.1",
"essreduce>=24.08.2",
"graphviz",
"numpy",
"plopp",
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
essreduce>=24.07.1
essreduce>=24.08.2
graphviz
numpy
plopp
Expand Down
32 changes: 21 additions & 11 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:644597105dd89e09109382941ce5eb8d7de1db9d
# SHA1:2ff97b6a96b750574b258e7cfc322df8621ef521
#
# This file is autogenerated by pip-compile-multi
# To update, run:
Expand All @@ -19,12 +19,14 @@ cyclebane==24.6.0
# via sciline
cycler==0.12.1
# via matplotlib
dask==2024.8.0
dask==2024.8.1
# via -r base.in
decorator==5.1.1
# via ipython
essreduce==24.8.0
essreduce==24.8.2
# via -r base.in
exceptiongroup==1.2.2
# via ipython
executing==2.0.1
# via stack-data
fonttools==4.53.1
Expand All @@ -37,23 +39,25 @@ h5py==3.11.0
# via
# scippneutron
# scippnexus
importlib-metadata==8.4.0
# via dask
ipydatawidgets==4.3.5
# via pythreejs
ipython==8.26.0
# via ipywidgets
ipywidgets==8.1.3
ipywidgets==8.1.5
# via
# ipydatawidgets
# pythreejs
jedi==0.19.1
# via ipython
jupyterlab-widgets==3.0.11
jupyterlab-widgets==3.0.13
# via ipywidgets
kiwisolver==1.4.5
# via matplotlib
locket==1.0.0
# via partd
matplotlib==3.9.1.post1
matplotlib==3.9.2
# via
# mpltoolbox
# plopp
Expand All @@ -63,7 +67,7 @@ mpltoolbox==24.5.1
# via scippneutron
networkx==3.3
# via cyclebane
numpy==2.0.1
numpy==2.1.0
# via
# -r base.in
# contourpy
Expand Down Expand Up @@ -99,7 +103,7 @@ pure-eval==0.2.3
# via stack-data
pygments==2.18.0
# via ipython
pyparsing==3.1.2
pyparsing==3.1.4
# via matplotlib
python-dateutil==2.9.0.post0
# via
Expand All @@ -110,7 +114,9 @@ pythreejs==2.4.2
pyyaml==6.0.2
# via dask
sciline==24.6.2
# via -r base.in
# via
# -r base.in
# essreduce
scipp==24.8.0
# via
# -r base.in
Expand All @@ -124,7 +130,7 @@ scippnexus==24.8.1
# -r base.in
# essreduce
# scippneutron
scipy==1.14.0
scipy==1.14.1
# via
# scippneutron
# scippnexus
Expand All @@ -148,7 +154,11 @@ traitlets==5.14.3
# traittypes
traittypes==0.2.1
# via ipydatawidgets
typing-extensions==4.12.2
# via ipython
wcwidth==0.2.13
# via prompt-toolkit
widgetsnbextension==4.0.11
widgetsnbextension==4.0.13
# via ipywidgets
zipp==3.20.0
# via importlib-metadata
4 changes: 2 additions & 2 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ charset-normalizer==3.3.2
# via requests
exceptiongroup==1.2.2
# via pytest
idna==3.7
idna==3.8
# via requests
iniconfig==2.0.0
# via pytest
numpy==2.0.1
numpy==2.1.0
# via
# -r basetest.in
# pandas
Expand Down
6 changes: 3 additions & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# pip-compile-multi
#
cachetools==5.4.0
cachetools==5.5.0
# via tox
certifi==2024.7.4
# via requests
Expand All @@ -25,7 +25,7 @@ gitdb==4.0.11
# via gitpython
gitpython==3.1.43
# via -r ci.in
idna==3.7
idna==3.8
# via requests
packaging==24.1
# via
Expand All @@ -48,7 +48,7 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.17.1
tox==4.18.0
# via -r ci.in
urllib3==2.2.2
# via requests
Expand Down
4 changes: 2 additions & 2 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ terminado==0.18.1
# jupyter-server-terminals
toposort==1.10
# via pip-compile-multi
types-python-dateutil==2.9.0.20240316
types-python-dateutil==2.9.0.20240821
# via arrow
uri-template==1.3.0
# via jsonschema
webcolors==24.6.0
webcolors==24.8.0
# via jsonschema
websocket-client==1.8.0
# via jupyter-server
Expand Down
10 changes: 5 additions & 5 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ attrs==24.2.0
# via
# jsonschema
# referencing
babel==2.15.0
babel==2.16.0
# via
# pydata-sphinx-theme
# sphinx
Expand Down Expand Up @@ -42,7 +42,7 @@ docutils==0.21.2
# sphinxcontrib-bibtex
fastjsonschema==2.20.0
# via nbformat
idna==3.7
idna==3.8
# via requests
imagesize==1.4.1
# via sphinx
Expand Down Expand Up @@ -102,7 +102,7 @@ nbformat==5.10.4
# nbclient
# nbconvert
# nbsphinx
nbsphinx==0.9.4
nbsphinx==0.9.5
# via -r docs.in
nest-asyncio==1.6.0
# via ipykernel
Expand Down Expand Up @@ -130,7 +130,7 @@ pydata-sphinx-theme==0.15.4
# via -r docs.in
pytz==2024.1
# via pandas
pyzmq==26.1.0
pyzmq==26.2.0
# via
# ipykernel
# jupyter-client
Expand All @@ -148,7 +148,7 @@ rpds-py==0.20.0
# referencing
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
soupsieve==2.6
# via beautifulsoup4
sphinx==8.0.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/mypy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# pip-compile-multi
#
-r test.txt
mypy==1.11.1
mypy==1.11.2
# via -r mypy.in
mypy-extensions==1.0.0
# via mypy
22 changes: 12 additions & 10 deletions requirements/nightly.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ cyclebane==24.6.0
# via sciline
cycler==0.12.1
# via matplotlib
dask==2024.8.0
dask==2024.8.1
# via -r nightly.in
decorator==5.1.1
# via ipython
Expand All @@ -38,25 +38,25 @@ h5py==3.11.0
# via
# scippneutron
# scippnexus
importlib-metadata==8.2.0
importlib-metadata==8.4.0
# via dask
ipydatawidgets==4.3.5
# via pythreejs
ipython==8.26.0
# via ipywidgets
ipywidgets==8.1.3
ipywidgets==8.1.5
# via
# ipydatawidgets
# pythreejs
jedi==0.19.1
# via ipython
jupyterlab-widgets==3.0.11
jupyterlab-widgets==3.0.13
# via ipywidgets
kiwisolver==1.4.5
# via matplotlib
locket==1.0.0
# via partd
matplotlib==3.9.1.post1
matplotlib==3.9.2
# via
# mpltoolbox
# plopp
Expand Down Expand Up @@ -86,14 +86,16 @@ pure-eval==0.2.3
# via stack-data
pygments==2.18.0
# via ipython
pyparsing==3.1.2
pyparsing==3.1.4
# via matplotlib
pythreejs==2.4.2
# via -r nightly.in
pyyaml==6.0.2
# via dask
sciline @ git+https://github.com/scipp/sciline@main
# via -r nightly.in
# via
# -r nightly.in
# essreduce
scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
# via
# -r nightly.in
Expand All @@ -107,7 +109,7 @@ scippnexus @ git+https://github.com/scipp/scippnexus@main
# -r nightly.in
# essreduce
# scippneutron
scipy==1.14.0
scipy==1.14.1
# via
# scippneutron
# scippnexus
Expand All @@ -131,7 +133,7 @@ typing-extensions==4.12.2
# via ipython
wcwidth==0.2.13
# via prompt-toolkit
widgetsnbextension==4.0.11
widgetsnbextension==4.0.13
# via ipywidgets
zipp==3.19.2
zipp==3.20.0
# via importlib-metadata
3 changes: 0 additions & 3 deletions src/ess/dream/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

del importlib

providers = (*nexus.providers,)


__all__ = [
'DreamGeant4Workflow',
'default_parameters',
Expand Down
Loading