Merge pull request #55 from scipp/scippneutron-theta

Use scattering angle function from ScippNeutron

Author: jl-wynen

pyproject.toml

@@ -38,7 +38,7 @@ dependencies = [
   "orsopy",
   "sciline>=24.6.0",
   "scipp>=23.8.0",
-  "scippneutron>=23.9.0",
+  "scippneutron>=24.7.0",
   "essreduce",
 ]
 

requirements/base.in

@@ -10,5 +10,5 @@ pythreejs
 orsopy
 sciline>=24.6.0
 scipp>=23.8.0
-scippneutron>=23.9.0
+scippneutron>=24.7.0
 essreduce

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:e11d135cfcc0ae8694f1a9061a0aaea415f470f2
+# SHA1:03305bbd69a8ade40d4806be66defcfa33bb2197
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -7,7 +7,7 @@
 #
 asttokens==2.4.1
     # via stack-data
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 charset-normalizer==3.3.2
     # via requests
@@ -23,17 +23,19 @@ cyclebane==24.6.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.6.0
+dask==2024.7.0
     # via -r base.in
 decorator==5.1.1
     # via ipython
-essreduce==24.3.11
+essreduce==24.6.0
     # via -r base.in
+exceptiongroup==1.2.1
+    # via ipython
 executing==2.0.1
     # via stack-data
-fonttools==4.53.0
+fonttools==4.53.1
     # via matplotlib
-fsspec==2024.6.0
+fsspec==2024.6.1
     # via dask
 graphviz==0.20.3
     # via -r base.in
@@ -43,9 +45,11 @@ h5py==3.11.0
     #   scippnexus
 idna==3.7
     # via requests
+importlib-metadata==8.0.0
+    # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.25.0
+ipython==8.26.0
     # via ipywidgets
 ipywidgets==8.1.3
     # via
@@ -59,10 +63,14 @@ kiwisolver==1.4.5
     # via matplotlib
 locket==1.0.0
     # via partd
-matplotlib==3.9.0
-    # via plopp
+matplotlib==3.9.1
+    # via
+    #   mpltoolbox
+    #   plopp
 matplotlib-inline==0.1.7
     # via ipython
+mpltoolbox==24.5.1
+    # via scippneutron
 networkx==3.3
     # via cyclebane
 numpy==2.0.0
@@ -71,6 +79,7 @@ numpy==2.0.0
     #   h5py
     #   ipydatawidgets
     #   matplotlib
+    #   mpltoolbox
     #   pythreejs
     #   scipp
     #   scippneutron
@@ -88,7 +97,7 @@ partd==1.4.2
     # via dask
 pexpect==4.9.0
     # via ipython
-pillow==10.3.0
+pillow==10.4.0
     # via matplotlib
 platformdirs==4.2.2
     # via pooch
@@ -121,21 +130,21 @@ pyyaml==6.0.1
     #   orsopy
 requests==2.32.3
     # via pooch
-sciline==24.6.0
+sciline==24.6.2
     # via -r base.in
 scipp==24.6.0
     # via
     #   -r base.in
     #   essreduce
     #   scippneutron
     #   scippnexus
-scippneutron==24.5.0
+scippneutron==24.7.0
     # via -r base.in
 scippnexus==24.6.0
     # via
     #   essreduce
     #   scippneutron
-scipy==1.13.1
+scipy==1.14.0
     # via
     #   scippneutron
     #   scippnexus
@@ -159,9 +168,13 @@ traitlets==5.14.3
     #   traittypes
 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
+    # via importlib-metadata

requirements/ci.txt

@@ -7,7 +7,7 @@
 #
 cachetools==5.3.3
     # via tox
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 chardet==5.2.0
     # via tox
@@ -17,7 +17,7 @@ colorama==0.4.6
     # via tox
 distlib==0.3.8
     # via virtualenv
-filelock==3.15.1
+filelock==3.15.4
     # via
     #   tox
     #   virtualenv
@@ -38,7 +38,7 @@ platformdirs==4.2.2
     #   virtualenv
 pluggy==1.5.0
     # via tox
-pyproject-api==1.6.1
+pyproject-api==1.7.1
     # via tox
 requests==2.32.3
     # via -r ci.in
@@ -48,9 +48,9 @@ tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.15.1
+tox==4.16.0
     # via -r ci.in
 urllib3==2.2.2
     # via requests
-virtualenv==20.26.2
+virtualenv==20.26.3
     # via tox

requirements/dev.txt

@@ -1,4 +1,4 @@
-# SHA1:a6303015b60a73fc228181da927b7e31fb52a35f
+# SHA1:efd19a3a98c69fc3d6d6233ed855de7e4a208f74
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -28,9 +28,9 @@ async-lru==2.0.4
     # via jupyterlab
 cffi==1.16.0
     # via argon2-cffi-bindings
-copier==9.2.0
+copier==9.3.1
     # via -r dev.in
-dunamai==1.21.1
+dunamai==1.21.2
     # via copier
 fqdn==1.5.1
     # via jsonschema
@@ -67,7 +67,7 @@ jupyter-server==2.14.1
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.2.2
+jupyterlab==4.2.3
     # via -r dev.in
 jupyterlab-server==2.27.2
     # via jupyterlab
@@ -87,14 +87,12 @@ prometheus-client==0.20.0
     # via jupyter-server
 pycparser==2.22
     # via cffi
-pydantic==2.7.4
+pydantic==2.8.2
     # via copier
-pydantic-core==2.18.4
+pydantic-core==2.20.1
     # via pydantic
 python-json-logger==2.0.7
     # via jupyter-events
-pyyaml-include==1.4.1
-    # via -r dev.in
 questionary==1.10.0
     # via copier
 rfc3339-validator==0.1.4

requirements/docs.txt

@@ -24,7 +24,7 @@ beautifulsoup4==4.12.3
     #   pydata-sphinx-theme
 bleach==6.1.0
     # via nbconvert
-debugpy==1.8.1
+debugpy==1.8.2
     # via ipykernel
 defusedxml==0.7.1
     # via nbconvert
@@ -38,7 +38,7 @@ fastjsonschema==2.20.0
     # via nbformat
 imagesize==1.4.1
     # via sphinx
-ipykernel==6.29.4
+ipykernel==6.29.5
     # via -r docs.in
 jinja2==3.1.4
     # via
@@ -94,9 +94,9 @@ nest-asyncio==1.6.0
     # via ipykernel
 pandocfilters==1.5.1
     # via nbconvert
-psutil==5.9.8
+psutil==6.0.0
     # via ipykernel
-pydata-sphinx-theme==0.15.3
+pydata-sphinx-theme==0.15.4
     # via -r docs.in
 pyzmq==26.0.3
     # via
@@ -123,7 +123,7 @@ sphinx==7.3.7
     #   sphinx-autodoc-typehints
     #   sphinx-copybutton
     #   sphinx-design
-sphinx-autodoc-typehints==2.1.1
+sphinx-autodoc-typehints==2.2.2
     # via -r docs.in
 sphinx-copybutton==0.5.2
     # via -r docs.in

requirements/mypy.txt

@@ -6,7 +6,7 @@
 #    pip-compile-multi
 #
 -r test.txt
-mypy==1.10.0
+mypy==1.10.1
     # via -r mypy.in
 mypy-extensions==1.0.0
     # via mypy

requirements/nightly.txt

@@ -8,7 +8,7 @@
 -r basetest.txt
 asttokens==2.4.1
     # via stack-data
-certifi==2024.6.2
+certifi==2024.7.4
     # via requests
 charset-normalizer==3.3.2
     # via requests
@@ -24,17 +24,17 @@ cyclebane==24.6.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.6.0
+dask==2024.7.0
     # via -r nightly.in
 decorator==5.1.1
     # via ipython
-essreduce==24.3.11
+essreduce==24.6.0
     # via -r nightly.in
 executing==2.0.1
     # via stack-data
-fonttools==4.53.0
+fonttools==4.53.1
     # via matplotlib
-fsspec==2024.6.0
+fsspec==2024.6.1
     # via dask
 graphviz==0.20.3
     # via -r nightly.in
@@ -44,11 +44,11 @@ h5py==3.11.0
     #   scippnexus
 idna==3.7
     # via requests
-importlib-metadata==7.1.0
+importlib-metadata==8.0.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.25.0
+ipython==8.26.0
     # via ipywidgets
 ipywidgets==8.1.3
     # via
@@ -62,7 +62,7 @@ kiwisolver==1.4.5
     # via matplotlib
 locket==1.0.0
     # via partd
-matplotlib==3.9.0
+matplotlib==3.9.1
     # via
     #   mpltoolbox
     #   plopp
@@ -91,7 +91,7 @@ partd==1.4.2
     # via dask
 pexpect==4.9.0
     # via ipython
-pillow==10.3.0
+pillow==10.4.0
     # via matplotlib
 platformdirs==4.2.2
     # via pooch
@@ -139,7 +139,7 @@ scippnexus @ git+https://github.com/scipp/scippnexus@main
     #   -r nightly.in
     #   essreduce
     #   scippneutron
-scipy==1.13.1
+scipy==1.14.0
     # via
     #   scippneutron
     #   scippnexus

requirements/static.txt

@@ -9,9 +9,9 @@ cfgv==3.4.0
     # via pre-commit
 distlib==0.3.8
     # via virtualenv
-filelock==3.15.1
+filelock==3.15.4
     # via virtualenv
-identify==2.5.36
+identify==2.6.0
     # via pre-commit
 nodeenv==1.9.1
     # via pre-commit
@@ -21,5 +21,5 @@ pre-commit==3.7.1
     # via -r static.in
 pyyaml==6.0.1
     # via pre-commit
-virtualenv==20.26.2
+virtualenv==20.26.3
     # via pre-commit