Merge pull request #68 from scipp/fix-pooch

deps: remove amor.data from __init__, add pooch to basetest

docs/api-reference/index.md

@@ -44,7 +44,6 @@
  :template: module-template.rst
  :recursive:
 
- beamline
  conversions
  data
  instrument_view

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 *"
  ]

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"
  ]

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

requirements/basetest.in

@@ -2,3 +2,4 @@
 # Do not make an environment from this file, use test.txt instead!
 
 pytest
+pooch

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

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

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:

requirements/docs.in

@@ -8,3 +8,4 @@ sphinx
 sphinx-autodoc-typehints
 sphinx-copybutton
 sphinx-design
+pooch

requirements/docs.txt

@@ -1,4 +1,4 @@
-# SHA1:2175813590b5d31dc1cdf3e3c820f699647e9043
+# SHA1:76d668ce06113541571e62da41baa0b2dc6b65be
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -8,13 +8,13 @@
 -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
+attrs==24.2.0
  # via
  # jsonschema
  # referencing
-babel==2.15.0
+babel==2.16.0
  # via
  # pydata-sphinx-theme
  # sphinx
@@ -24,7 +24,11 @@ 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
+debugpy==1.8.5
  # via ipykernel
 defusedxml==0.7.1
  # via nbconvert
@@ -36,6 +40,8 @@ docutils==0.21.2
  # sphinx
 fastjsonschema==2.20.0
  # via nbformat
+idna==3.7
+ # via requests
 imagesize==1.4.1
  # via sphinx
 ipykernel==6.29.5
@@ -77,7 +83,7 @@ mdurl==0.1.2
  # via markdown-it-py
 mistune==3.0.2
  # via nbconvert
-myst-parser==3.0.1
+myst-parser==4.0.0
  # via -r docs.in
 nbclient==0.10.0
  # via nbconvert
@@ -88,33 +94,43 @@ 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
 pandocfilters==1.5.1
  # via nbconvert
+platformdirs==4.2.2
+ # via
+ # jupyter-core
+ # pooch
+pooch==1.8.2
+ # via -r docs.in
 psutil==6.0.0
  # via ipykernel
 pydata-sphinx-theme==0.15.4
  # via -r docs.in
-pyzmq==26.0.3
+pyzmq==26.1.0
  # via
  # ipykernel
  # jupyter-client
 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
 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,19 +143,19 @@ 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
 tinycss2==1.3.0
  # via nbconvert
@@ -149,6 +165,8 @@ tornado==6.4.1
  # via
  # ipykernel
  # jupyter-client
+urllib3==2.2.2
+ # via requests
 webencodings==0.5.1
  # via
  # bleach

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