From 9c1a5d2223c53b333199bf8a276a1cc0882501f8 Mon Sep 17 00:00:00 2001 From: Johannes Kasimir Date: Wed, 14 Aug 2024 12:25:47 +0200 Subject: [PATCH 1/2] deps: remove amor.data from __init__, add pooch to basetest --- docs/user-guide/amor/amor-reduction.ipynb | 1 + docs/user-guide/amor/compare-to-eos.ipynb | 1 + requirements/base.txt | 31 +-- requirements/basetest.in | 1 + requirements/basetest.txt | 22 +- requirements/ci.txt | 2 +- requirements/dev.txt | 8 +- requirements/docs.in | 2 + requirements/docs.txt | 246 +++++++++++++++++++--- requirements/mypy.txt | 2 +- requirements/nightly.txt | 26 +-- requirements/static.txt | 4 +- src/ess/amor/__init__.py | 3 +- tests/amor/pipeline_test.py | 1 + tests/orso_test.py | 1 + 15 files changed, 271 insertions(+), 80 deletions(-) diff --git a/docs/user-guide/amor/amor-reduction.ipynb b/docs/user-guide/amor/amor-reduction.ipynb index e008755..55961e6 100644 --- a/docs/user-guide/amor/amor-reduction.ipynb +++ b/docs/user-guide/amor/amor-reduction.ipynb @@ -26,6 +26,7 @@ "source": [ "import scipp as sc\n", "from ess import amor\n", + "from ess.amor import data # noqa: F401\n", "from ess.reflectometry.types import *\n", "from ess.amor.types import *" ] diff --git a/docs/user-guide/amor/compare-to-eos.ipynb b/docs/user-guide/amor/compare-to-eos.ipynb index 99df2ca..2f73722 100644 --- a/docs/user-guide/amor/compare-to-eos.ipynb +++ b/docs/user-guide/amor/compare-to-eos.ipynb @@ -24,6 +24,7 @@ "import scipp as sc\n", "import plopp as pp\n", "from ess import amor\n", + "from ess.amor import data # noqa: F401\n", "from ess.reflectometry.types import *\n", "from ess.amor.types import ChopperPhase" ] diff --git a/requirements/base.txt b/requirements/base.txt index 02e432e..3e7d20f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,10 +7,6 @@ # asttokens==2.4.1 # via stack-data -certifi==2024.7.4 - # via requests -charset-normalizer==3.3.2 - # via requests click==8.1.7 # via dask cloudpickle==3.0.0 @@ -23,11 +19,11 @@ cyclebane==24.6.0 # via sciline cycler==0.12.1 # via matplotlib -dask==2024.7.1 +dask==2024.8.0 # via -r base.in decorator==5.1.1 # via ipython -essreduce==24.7.1 +essreduce==24.8.0 # via -r base.in exceptiongroup==1.2.2 # via ipython @@ -43,9 +39,7 @@ h5py==3.11.0 # via # scippneutron # scippnexus -idna==3.7 - # via requests -importlib-metadata==8.0.0 +importlib-metadata==8.2.0 # via dask ipydatawidgets==4.3.5 # via pythreejs @@ -63,7 +57,7 @@ kiwisolver==1.4.5 # via matplotlib locket==1.0.0 # via partd -matplotlib==3.9.1 +matplotlib==3.9.2 # via # mpltoolbox # plopp @@ -90,7 +84,6 @@ packaging==24.1 # via # dask # matplotlib - # pooch parso==0.8.4 # via jedi partd==1.4.2 @@ -99,14 +92,10 @@ pexpect==4.9.0 # via ipython pillow==10.4.0 # via matplotlib -platformdirs==4.2.2 - # via pooch plopp==24.6.0 # via # -r base.in # scippneutron -pooch==1.8.2 - # via scippneutron prompt-toolkit==3.0.47 # via ipython ptyprocess==0.7.0 @@ -124,12 +113,10 @@ python-dateutil==2.9.0.post0 # scippnexus pythreejs==2.4.2 # via -r base.in -pyyaml==6.0.1 +pyyaml==6.0.2 # via # dask # orsopy -requests==2.32.3 - # via pooch sciline==24.6.2 # via -r base.in scipp==24.6.0 @@ -138,9 +125,9 @@ scipp==24.6.0 # essreduce # scippneutron # scippnexus -scippneutron==24.7.0 +scippneutron==24.8.0 # via -r base.in -scippnexus==24.6.0 +scippnexus==24.8.1 # via # essreduce # scippneutron @@ -170,11 +157,9 @@ traittypes==0.2.1 # via ipydatawidgets typing-extensions==4.12.2 # via ipython -urllib3==2.2.2 - # via requests wcwidth==0.2.13 # via prompt-toolkit widgetsnbextension==4.0.11 # via ipywidgets -zipp==3.19.2 +zipp==3.20.0 # via importlib-metadata diff --git a/requirements/basetest.in b/requirements/basetest.in index e4a48b2..86467f4 100644 --- a/requirements/basetest.in +++ b/requirements/basetest.in @@ -2,3 +2,4 @@ # Do not make an environment from this file, use test.txt instead! pytest +pooch diff --git a/requirements/basetest.txt b/requirements/basetest.txt index 01f19d1..fef26a7 100644 --- a/requirements/basetest.txt +++ b/requirements/basetest.txt @@ -1,19 +1,35 @@ -# SHA1:0eaa389e1fdb3a1917c0f987514bd561be5718ee +# SHA1:54ed0e3deb2d458e91bae14067e84eaad659f5fd # # This file is autogenerated by pip-compile-multi # To update, run: # # pip-compile-multi # +certifi==2024.7.4 + # via requests +charset-normalizer==3.3.2 + # via requests exceptiongroup==1.2.2 # via pytest +idna==3.7 + # via requests iniconfig==2.0.0 # via pytest packaging==24.1 - # via pytest + # via + # pooch + # pytest +platformdirs==4.2.2 + # via pooch pluggy==1.5.0 # via pytest -pytest==8.3.1 +pooch==1.8.2 + # via -r basetest.in +pytest==8.3.2 # via -r basetest.in +requests==2.32.3 + # via pooch tomli==2.0.1 # via pytest +urllib3==2.2.2 + # via requests diff --git a/requirements/ci.txt b/requirements/ci.txt index 4bad3ae..b0cd56c 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -48,7 +48,7 @@ tomli==2.0.1 # via # pyproject-api # tox -tox==4.16.0 +tox==4.18.0 # via -r ci.in urllib3==2.2.2 # via requests diff --git a/requirements/dev.txt b/requirements/dev.txt index f0b20ea..3aa4ef6 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -26,11 +26,11 @@ arrow==1.3.0 # via isoduration async-lru==2.0.4 # via jupyterlab -cffi==1.16.0 +cffi==1.17.0 # via argon2-cffi-bindings copier==9.3.1 # via -r dev.in -dunamai==1.21.2 +dunamai==1.22.0 # via copier fqdn==1.5.1 # via jsonschema @@ -119,11 +119,11 @@ types-python-dateutil==2.9.0.20240316 # 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 -wheel==0.43.0 +wheel==0.44.0 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/docs.in b/requirements/docs.in index e542e53..b21de78 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -8,3 +8,5 @@ sphinx sphinx-autodoc-typehints sphinx-copybutton sphinx-design +pooch +matplotlib<=3.7.1 diff --git a/requirements/docs.txt b/requirements/docs.txt index 023c069..b95c0c7 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,20 +1,14 @@ -# SHA1:2175813590b5d31dc1cdf3e3c820f699647e9043 -# -# This file is autogenerated by pip-compile-multi -# To update, run: -# -# pip-compile-multi -# --r base.txt accessible-pygments==0.0.5 # via pydata-sphinx-theme -alabaster==0.7.16 +alabaster==1.0.0 # via sphinx -attrs==23.2.0 +asttokens==2.4.1 + # via stack-data +attrs==24.2.0 # via # jsonschema # referencing -babel==2.15.0 +babel==2.16.0 # via # pydata-sphinx-theme # sphinx @@ -24,8 +18,30 @@ beautifulsoup4==4.12.3 # pydata-sphinx-theme bleach==6.1.0 # via nbconvert -debugpy==1.8.2 +certifi==2024.7.4 + # via requests +charset-normalizer==3.3.2 + # via requests +click==8.1.7 + # via dask +cloudpickle==3.0.0 + # via dask +comm==0.2.2 + # via + # ipykernel + # ipywidgets +contourpy==1.2.1 + # via matplotlib +cyclebane==24.6.0 + # via sciline +cycler==0.12.1 + # via matplotlib +dask==2024.8.0 + # via -r base.in +debugpy==1.8.5 # via ipykernel +decorator==5.1.1 + # via ipython defusedxml==0.7.1 # via nbconvert docutils==0.21.2 @@ -34,12 +50,45 @@ docutils==0.21.2 # nbsphinx # pydata-sphinx-theme # sphinx +essreduce==24.8.0 + # via -r base.in +exceptiongroup==1.2.2 + # via ipython +executing==2.0.1 + # via stack-data fastjsonschema==2.20.0 # via nbformat +fonttools==4.53.1 + # via matplotlib +fsspec==2024.6.1 + # via dask +graphviz==0.20.3 + # via -r base.in +h5py==3.11.0 + # via + # scippneutron + # scippnexus +idna==3.7 + # via requests imagesize==1.4.1 # via sphinx +importlib-metadata==8.2.0 + # via dask +ipydatawidgets==4.3.5 + # via pythreejs ipykernel==6.29.5 # via -r docs.in +ipython==8.26.0 + # via + # -r docs.in + # ipykernel + # ipywidgets +ipywidgets==8.1.3 + # via + # ipydatawidgets + # pythreejs +jedi==0.19.1 + # via ipython jinja2==3.1.4 # via # myst-parser @@ -63,6 +112,12 @@ jupyter-core==5.7.2 # nbformat jupyterlab-pygments==0.3.0 # via nbconvert +jupyterlab-widgets==3.0.11 + # via ipywidgets +kiwisolver==1.4.5 + # via matplotlib +locket==1.0.0 + # via partd markdown-it-py==3.0.0 # via # mdit-py-plugins @@ -71,13 +126,24 @@ markupsafe==2.1.5 # via # jinja2 # nbconvert +matplotlib==3.7.1 + # via + # -r docs.in + # mpltoolbox + # plopp +matplotlib-inline==0.1.7 + # via + # ipykernel + # ipython mdit-py-plugins==0.4.1 # via myst-parser mdurl==0.1.2 # via markdown-it-py mistune==3.0.2 # via nbconvert -myst-parser==3.0.1 +mpltoolbox==24.5.1 + # via scippneutron +myst-parser==4.0.0 # via -r docs.in nbclient==0.10.0 # via nbconvert @@ -88,17 +154,87 @@ 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 +networkx==3.3 + # via cyclebane +numpy==2.0.1 + # via + # contourpy + # h5py + # ipydatawidgets + # matplotlib + # mpltoolbox + # pythreejs + # scipp + # scippneutron + # scipy +orsopy==1.2.1 + # via -r base.in +packaging==24.1 + # via + # dask + # ipykernel + # matplotlib + # nbconvert + # pooch + # pydata-sphinx-theme + # sphinx pandocfilters==1.5.1 # via nbconvert +parso==0.8.4 + # via jedi +partd==1.4.2 + # via dask +pexpect==4.9.0 + # via ipython +pillow==10.4.0 + # via matplotlib +platformdirs==4.2.2 + # via + # jupyter-core + # pooch +plopp==24.6.0 + # via + # -r base.in + # scippneutron +pooch==1.8.2 + # via -r docs.in +prompt-toolkit==3.0.47 + # via ipython psutil==6.0.0 # via ipykernel +ptyprocess==0.7.0 + # via pexpect +pure-eval==0.2.3 + # via stack-data pydata-sphinx-theme==0.15.4 # via -r docs.in -pyzmq==26.0.3 +pygments==2.18.0 + # via + # accessible-pygments + # ipython + # nbconvert + # pydata-sphinx-theme + # sphinx +pyparsing==3.1.2 + # via matplotlib +python-dateutil==2.9.0.post0 + # via + # -r base.in + # jupyter-client + # matplotlib + # scippnexus +pythreejs==2.4.2 + # via -r base.in +pyyaml==6.0.2 + # via + # dask + # myst-parser + # orsopy +pyzmq==26.1.0 # via # ipykernel # jupyter-client @@ -106,15 +242,42 @@ referencing==0.35.1 # via # jsonschema # jsonschema-specifications -rpds-py==0.19.0 +requests==2.32.3 + # via + # pooch + # sphinx +rpds-py==0.20.0 # via # jsonschema # referencing +sciline==24.6.2 + # via -r base.in +scipp==24.6.0 + # via + # -r base.in + # essreduce + # scippneutron + # scippnexus +scippneutron==24.8.0 + # via -r base.in +scippnexus==24.8.1 + # via + # essreduce + # scippneutron +scipy==1.14.0 + # via + # scippneutron + # scippnexus +six==1.16.0 + # via + # asttokens + # bleach + # python-dateutil snowballstemmer==2.2.0 # via sphinx -soupsieve==2.5 +soupsieve==2.6 # via beautifulsoup4 -sphinx==7.4.7 +sphinx==8.0.2 # via # -r docs.in # myst-parser @@ -127,29 +290,64 @@ sphinx-autodoc-typehints==2.2.3 # via -r docs.in sphinx-copybutton==0.5.2 # via -r docs.in -sphinx-design==0.6.0 +sphinx-design==0.6.1 # via -r docs.in -sphinxcontrib-applehelp==1.0.8 +sphinxcontrib-applehelp==2.0.0 # via sphinx -sphinxcontrib-devhelp==1.0.6 +sphinxcontrib-devhelp==2.0.0 # via sphinx -sphinxcontrib-htmlhelp==2.0.6 +sphinxcontrib-htmlhelp==2.1.0 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx -sphinxcontrib-qthelp==1.0.8 +sphinxcontrib-qthelp==2.0.0 # via sphinx -sphinxcontrib-serializinghtml==1.1.10 +sphinxcontrib-serializinghtml==2.0.0 # via sphinx +stack-data==0.6.3 + # via ipython tinycss2==1.3.0 # via nbconvert tomli==2.0.1 # via sphinx +toolz==0.12.1 + # via + # dask + # partd tornado==6.4.1 # via # ipykernel # jupyter-client +traitlets==5.14.3 + # via + # comm + # ipykernel + # ipython + # ipywidgets + # jupyter-client + # jupyter-core + # matplotlib-inline + # nbclient + # nbconvert + # nbformat + # nbsphinx + # pythreejs + # traittypes +traittypes==0.2.1 + # via ipydatawidgets +typing-extensions==4.12.2 + # via + # ipython + # pydata-sphinx-theme +urllib3==2.2.2 + # via requests +wcwidth==0.2.13 + # via prompt-toolkit webencodings==0.5.1 # via # bleach # tinycss2 +widgetsnbextension==4.0.11 + # via ipywidgets +zipp==3.20.0 + # via importlib-metadata diff --git a/requirements/mypy.txt b/requirements/mypy.txt index bc5d965..e0374a1 100644 --- a/requirements/mypy.txt +++ b/requirements/mypy.txt @@ -6,7 +6,7 @@ # pip-compile-multi # -r test.txt -mypy==1.11.0 +mypy==1.11.1 # via -r mypy.in mypy-extensions==1.0.0 # via mypy diff --git a/requirements/nightly.txt b/requirements/nightly.txt index 7d252e1..93d9574 100644 --- a/requirements/nightly.txt +++ b/requirements/nightly.txt @@ -8,10 +8,6 @@ -r basetest.txt asttokens==2.4.1 # via stack-data -certifi==2024.7.4 - # via requests -charset-normalizer==3.3.2 - # via requests click==8.1.7 # via dask cloudpickle==3.0.0 @@ -24,11 +20,11 @@ cyclebane==24.6.0 # via sciline cycler==0.12.1 # via matplotlib -dask==2024.7.1 +dask==2024.8.0 # via -r nightly.in decorator==5.1.1 # via ipython -essreduce==24.7.1 +essreduce==24.8.0 # via -r nightly.in executing==2.0.1 # via stack-data @@ -42,9 +38,7 @@ h5py==3.11.0 # via # scippneutron # scippnexus -idna==3.7 - # via requests -importlib-metadata==8.0.0 +importlib-metadata==8.2.0 # via dask ipydatawidgets==4.3.5 # via pythreejs @@ -62,7 +56,7 @@ kiwisolver==1.4.5 # via matplotlib locket==1.0.0 # via partd -matplotlib==3.9.1 +matplotlib==3.9.2 # via # mpltoolbox # plopp @@ -93,14 +87,10 @@ pexpect==4.9.0 # via ipython pillow==10.4.0 # via matplotlib -platformdirs==4.2.2 - # via pooch plopp @ git+https://github.com/scipp/plopp@main # via # -r nightly.in # scippneutron -pooch==1.8.2 - # via scippneutron prompt-toolkit==3.0.47 # via ipython ptyprocess==0.7.0 @@ -118,12 +108,10 @@ python-dateutil==2.9.0.post0 # scippnexus pythreejs==2.4.2 # via -r nightly.in -pyyaml==6.0.1 +pyyaml==6.0.2 # via # dask # orsopy -requests==2.32.3 - # via pooch sciline @ git+https://github.com/scipp/sciline@main # 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 @@ -165,11 +153,9 @@ traittypes==0.2.1 # via ipydatawidgets typing-extensions==4.12.2 # via ipython -urllib3==2.2.2 - # via requests wcwidth==0.2.13 # via prompt-toolkit widgetsnbextension==4.0.11 # via ipywidgets -zipp==3.19.2 +zipp==3.20.0 # via importlib-metadata diff --git a/requirements/static.txt b/requirements/static.txt index e106d60..85da246 100644 --- a/requirements/static.txt +++ b/requirements/static.txt @@ -17,9 +17,9 @@ nodeenv==1.9.1 # via pre-commit platformdirs==4.2.2 # via virtualenv -pre-commit==3.7.1 +pre-commit==3.8.0 # via -r static.in -pyyaml==6.0.1 +pyyaml==6.0.2 # via pre-commit virtualenv==20.26.3 # via pre-commit diff --git a/src/ess/amor/__init__.py b/src/ess/amor/__init__.py index 5c946e4..81a498a 100644 --- a/src/ess/amor/__init__.py +++ b/src/ess/amor/__init__.py @@ -16,7 +16,7 @@ SamplePosition, BeamDivergenceLimits, ) -from . import conversions, data, load, orso, resolution, utils +from . import conversions, load, orso, resolution, utils from .instrument_view import instrument_view from .types import ( AngularResolution, @@ -80,7 +80,6 @@ def AmorWorkflow() -> sciline.Pipeline: "supermirror", "beamline", "conversions", - "data", "load", "orso", "resolution", diff --git a/tests/amor/pipeline_test.py b/tests/amor/pipeline_test.py index b606e5b..fab067e 100644 --- a/tests/amor/pipeline_test.py +++ b/tests/amor/pipeline_test.py @@ -7,6 +7,7 @@ import sciline import scipp as sc from ess import amor +from ess.amor import data # noqa: F401 from ess.reflectometry import orso from ess.reflectometry.types import ( Filename, diff --git a/tests/orso_test.py b/tests/orso_test.py index 59b03b4..6db44bc 100644 --- a/tests/orso_test.py +++ b/tests/orso_test.py @@ -4,6 +4,7 @@ import sciline from ess import amor, reflectometry +from ess.amor import data # noqa: F401 from ess.reflectometry import orso from ess.reflectometry.types import Filename, ReferenceRun, SampleRun from orsopy import fileio From 8f984a850b7bb190fc1fa3c7ca6ffcc110db143f Mon Sep 17 00:00:00 2001 From: Johannes Kasimir Date: Wed, 14 Aug 2024 16:50:24 +0200 Subject: [PATCH 2/2] fix --- docs/api-reference/index.md | 1 - requirements/docs.in | 1 - requirements/docs.txt | 196 ++---------------------------------- src/ess/amor/__init__.py | 1 - 4 files changed, 8 insertions(+), 191 deletions(-) diff --git a/docs/api-reference/index.md b/docs/api-reference/index.md index de2bcba..3b023e7 100644 --- a/docs/api-reference/index.md +++ b/docs/api-reference/index.md @@ -44,7 +44,6 @@ :template: module-template.rst :recursive: - beamline conversions data instrument_view diff --git a/requirements/docs.in b/requirements/docs.in index b21de78..ac5f73a 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -9,4 +9,3 @@ sphinx-autodoc-typehints sphinx-copybutton sphinx-design pooch -matplotlib<=3.7.1 diff --git a/requirements/docs.txt b/requirements/docs.txt index b95c0c7..fb05d8c 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,9 +1,15 @@ +# SHA1:76d668ce06113541571e62da41baa0b2dc6b65be +# +# This file is autogenerated by pip-compile-multi +# To update, run: +# +# pip-compile-multi +# +-r base.txt accessible-pygments==0.0.5 # via pydata-sphinx-theme alabaster==1.0.0 # via sphinx -asttokens==2.4.1 - # via stack-data attrs==24.2.0 # via # jsonschema @@ -22,26 +28,8 @@ certifi==2024.7.4 # via requests charset-normalizer==3.3.2 # via requests -click==8.1.7 - # via dask -cloudpickle==3.0.0 - # via dask -comm==0.2.2 - # via - # ipykernel - # ipywidgets -contourpy==1.2.1 - # via matplotlib -cyclebane==24.6.0 - # via sciline -cycler==0.12.1 - # via matplotlib -dask==2024.8.0 - # via -r base.in debugpy==1.8.5 # via ipykernel -decorator==5.1.1 - # via ipython defusedxml==0.7.1 # via nbconvert docutils==0.21.2 @@ -50,45 +38,14 @@ docutils==0.21.2 # nbsphinx # pydata-sphinx-theme # sphinx -essreduce==24.8.0 - # via -r base.in -exceptiongroup==1.2.2 - # via ipython -executing==2.0.1 - # via stack-data fastjsonschema==2.20.0 # via nbformat -fonttools==4.53.1 - # via matplotlib -fsspec==2024.6.1 - # via dask -graphviz==0.20.3 - # via -r base.in -h5py==3.11.0 - # via - # scippneutron - # scippnexus idna==3.7 # via requests imagesize==1.4.1 # via sphinx -importlib-metadata==8.2.0 - # via dask -ipydatawidgets==4.3.5 - # via pythreejs ipykernel==6.29.5 # via -r docs.in -ipython==8.26.0 - # via - # -r docs.in - # ipykernel - # ipywidgets -ipywidgets==8.1.3 - # via - # ipydatawidgets - # pythreejs -jedi==0.19.1 - # via ipython jinja2==3.1.4 # via # myst-parser @@ -112,12 +69,6 @@ jupyter-core==5.7.2 # nbformat jupyterlab-pygments==0.3.0 # via nbconvert -jupyterlab-widgets==3.0.11 - # via ipywidgets -kiwisolver==1.4.5 - # via matplotlib -locket==1.0.0 - # via partd markdown-it-py==3.0.0 # via # mdit-py-plugins @@ -126,23 +77,12 @@ markupsafe==2.1.5 # via # jinja2 # nbconvert -matplotlib==3.7.1 - # via - # -r docs.in - # mpltoolbox - # plopp -matplotlib-inline==0.1.7 - # via - # ipykernel - # ipython mdit-py-plugins==0.4.1 # via myst-parser mdurl==0.1.2 # via markdown-it-py mistune==3.0.2 # via nbconvert -mpltoolbox==24.5.1 - # via scippneutron myst-parser==4.0.0 # via -r docs.in nbclient==0.10.0 @@ -158,82 +98,18 @@ nbsphinx==0.9.5 # via -r docs.in nest-asyncio==1.6.0 # via ipykernel -networkx==3.3 - # via cyclebane -numpy==2.0.1 - # via - # contourpy - # h5py - # ipydatawidgets - # matplotlib - # mpltoolbox - # pythreejs - # scipp - # scippneutron - # scipy -orsopy==1.2.1 - # via -r base.in -packaging==24.1 - # via - # dask - # ipykernel - # matplotlib - # nbconvert - # pooch - # pydata-sphinx-theme - # sphinx pandocfilters==1.5.1 # via nbconvert -parso==0.8.4 - # via jedi -partd==1.4.2 - # via dask -pexpect==4.9.0 - # via ipython -pillow==10.4.0 - # via matplotlib platformdirs==4.2.2 # via # jupyter-core # pooch -plopp==24.6.0 - # via - # -r base.in - # scippneutron pooch==1.8.2 # via -r docs.in -prompt-toolkit==3.0.47 - # via ipython psutil==6.0.0 # via ipykernel -ptyprocess==0.7.0 - # via pexpect -pure-eval==0.2.3 - # via stack-data pydata-sphinx-theme==0.15.4 # via -r docs.in -pygments==2.18.0 - # via - # accessible-pygments - # ipython - # nbconvert - # pydata-sphinx-theme - # sphinx -pyparsing==3.1.2 - # via matplotlib -python-dateutil==2.9.0.post0 - # via - # -r base.in - # jupyter-client - # matplotlib - # scippnexus -pythreejs==2.4.2 - # via -r base.in -pyyaml==6.0.2 - # via - # dask - # myst-parser - # orsopy pyzmq==26.1.0 # via # ipykernel @@ -250,29 +126,6 @@ rpds-py==0.20.0 # via # jsonschema # referencing -sciline==24.6.2 - # via -r base.in -scipp==24.6.0 - # via - # -r base.in - # essreduce - # scippneutron - # scippnexus -scippneutron==24.8.0 - # via -r base.in -scippnexus==24.8.1 - # via - # essreduce - # scippneutron -scipy==1.14.0 - # via - # scippneutron - # scippnexus -six==1.16.0 - # via - # asttokens - # bleach - # python-dateutil snowballstemmer==2.2.0 # via sphinx soupsieve==2.6 @@ -304,50 +157,17 @@ sphinxcontrib-qthelp==2.0.0 # via sphinx sphinxcontrib-serializinghtml==2.0.0 # via sphinx -stack-data==0.6.3 - # via ipython tinycss2==1.3.0 # via nbconvert tomli==2.0.1 # via sphinx -toolz==0.12.1 - # via - # dask - # partd tornado==6.4.1 # via # ipykernel # jupyter-client -traitlets==5.14.3 - # via - # comm - # ipykernel - # ipython - # ipywidgets - # jupyter-client - # jupyter-core - # matplotlib-inline - # nbclient - # nbconvert - # nbformat - # nbsphinx - # pythreejs - # traittypes -traittypes==0.2.1 - # via ipydatawidgets -typing-extensions==4.12.2 - # via - # ipython - # pydata-sphinx-theme urllib3==2.2.2 # via requests -wcwidth==0.2.13 - # via prompt-toolkit webencodings==0.5.1 # via # bleach # tinycss2 -widgetsnbextension==4.0.11 - # via ipywidgets -zipp==3.20.0 - # via importlib-metadata diff --git a/src/ess/amor/__init__.py b/src/ess/amor/__init__.py index 81a498a..9113cf4 100644 --- a/src/ess/amor/__init__.py +++ b/src/ess/amor/__init__.py @@ -78,7 +78,6 @@ def AmorWorkflow() -> sciline.Pipeline: __all__ = [ "supermirror", - "beamline", "conversions", "load", "orso",