Merge pull request #99 from scipp/combine-runs

Combine data from several runs

Author: jokasimr

docs/api-reference/index.md

@@ -33,6 +33,7 @@
    supermirror
    types
    tools
+   workflow
 ```
 
 ## Amor

pyproject.toml

@@ -41,6 +41,7 @@ dependencies = [
   "scippneutron>=24.7.0",
   "scippnexus>=24.9.1",
   "essreduce",
+  "pandas",
 ]
 
 dynamic = ["version"]

requirements/base.in

@@ -13,3 +13,4 @@ scipp>=24.09.1
 scippneutron>=24.7.0
 scippnexus>=24.9.1
 essreduce
+pandas

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:3401cd389c29441d88f259ef065f189c2f02bfcb
+# SHA1:e82c2f6f325de86a068c5252c20acc8ebeb12449
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -9,41 +9,41 @@ asttokens==2.4.1
     # via stack-data
 click==8.1.7
     # via dask
-cloudpickle==3.0.0
+cloudpickle==3.1.0
     # via dask
 comm==0.2.2
     # via ipywidgets
 contourpy==1.3.0
     # via matplotlib
-cyclebane==24.6.0
+cyclebane==24.10.0
     # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.9.0
+dask==2024.10.0
     # via -r base.in
 decorator==5.1.1
     # via ipython
-essreduce==24.9.1
+essreduce==24.10.2
     # via -r base.in
 exceptiongroup==1.2.2
     # via ipython
 executing==2.1.0
     # via stack-data
 fonttools==4.54.1
     # via matplotlib
-fsspec==2024.9.0
+fsspec==2024.10.0
     # via dask
 graphviz==0.20.3
     # via -r base.in
-h5py==3.11.0
+h5py==3.12.1
     # via
     #   scippneutron
     #   scippnexus
 importlib-metadata==8.5.0
     # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.27.0
+ipython==8.28.0
     # via ipywidgets
 ipywidgets==8.1.5
     # via
@@ -65,15 +65,16 @@ matplotlib-inline==0.1.7
     # via ipython
 mpltoolbox==24.5.1
     # via scippneutron
-networkx==3.3
+networkx==3.4.2
     # via cyclebane
-numpy==2.1.1
+numpy==2.1.2
     # via
     #   contourpy
     #   h5py
     #   ipydatawidgets
     #   matplotlib
     #   mpltoolbox
+    #   pandas
     #   pythreejs
     #   scipp
     #   scippneutron
@@ -84,13 +85,15 @@ packaging==24.1
     # via
     #   dask
     #   matplotlib
+pandas==2.2.3
+    # via -r base.in
 parso==0.8.4
     # via jedi
 partd==1.4.2
     # via dask
 pexpect==4.9.0
     # via ipython
-pillow==10.4.0
+pillow==11.0.0
     # via matplotlib
 plopp==24.9.3
     # via
@@ -104,15 +107,18 @@ pure-eval==0.2.3
     # via stack-data
 pygments==2.18.0
     # via ipython
-pyparsing==3.1.4
+pyparsing==3.2.0
     # via matplotlib
 python-dateutil==2.9.0.post0
     # via
     #   -r base.in
     #   matplotlib
+    #   pandas
     #   scippnexus
 pythreejs==2.4.2
     # via -r base.in
+pytz==2024.2
+    # via pandas
 pyyaml==6.0.2
     # via
     #   dask
@@ -129,7 +135,7 @@ scipp==24.9.1
     #   scippnexus
 scippneutron==24.9.0
     # via -r base.in
-scippnexus==24.9.1
+scippnexus==24.10.0
     # via
     #   -r base.in
     #   essreduce
@@ -144,7 +150,7 @@ six==1.16.0
     #   python-dateutil
 stack-data==0.6.3
     # via ipython
-toolz==0.12.1
+toolz==1.0.0
     # via
     #   dask
     #   partd
@@ -160,6 +166,8 @@ traittypes==0.2.1
     # via ipydatawidgets
 typing-extensions==4.12.2
     # via ipython
+tzdata==2024.2
+    # via pandas
 wcwidth==0.2.13
     # via prompt-toolkit
 widgetsnbextension==4.0.13

requirements/basetest.txt

@@ -7,7 +7,7 @@
 #
 certifi==2024.8.30
     # via requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
 exceptiongroup==1.2.2
     # via pytest
@@ -29,7 +29,7 @@ pytest==8.3.3
     # via -r basetest.in
 requests==2.32.3
     # via pooch
-tomli==2.0.1
+tomli==2.0.2
     # via pytest
 urllib3==2.2.3
     # via requests

requirements/ci.txt

@@ -11,11 +11,11 @@ certifi==2024.8.30
     # via requests
 chardet==5.2.0
     # via tox
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
 colorama==0.4.6
     # via tox
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
 filelock==3.16.1
     # via
@@ -44,13 +44,15 @@ requests==2.32.3
     # via -r ci.in
 smmap==5.0.1
     # via gitdb
-tomli==2.0.1
+tomli==2.0.2
     # via
     #   pyproject-api
     #   tox
-tox==4.20.0
+tox==4.23.1
     # via -r ci.in
+typing-extensions==4.12.2
+    # via tox
 urllib3==2.2.3
     # via requests
-virtualenv==20.26.5
+virtualenv==20.27.0
     # via tox

requirements/dev.txt

@@ -14,7 +14,7 @@
 -r wheels.txt
 annotated-types==0.7.0
     # via pydantic
-anyio==4.6.0
+anyio==4.6.2.post1
     # via
     #   httpx
     #   jupyter-server
@@ -28,7 +28,7 @@ async-lru==2.0.4
     # via jupyterlab
 cffi==1.17.1
     # via argon2-cffi-bindings
-copier==9.3.1
+copier==9.4.1
     # via -r dev.in
 dunamai==1.22.0
     # via copier
@@ -38,7 +38,7 @@ funcy==2.0
     # via copier
 h11==0.14.0
     # via httpcore
-httpcore==1.0.5
+httpcore==1.0.6
     # via httpx
 httpx==0.27.2
     # via jupyterlab
@@ -81,7 +81,7 @@ pip-compile-multi==2.6.4
     # via -r dev.in
 pip-tools==7.4.1
     # via pip-compile-multi
-plumbum==1.8.3
+plumbum==1.9.0
     # via copier
 prometheus-client==0.21.0
     # via jupyter-server
@@ -115,7 +115,7 @@ terminado==0.18.1
     #   jupyter-server-terminals
 toposort==1.10
     # via pip-compile-multi
-types-python-dateutil==2.9.0.20240906
+types-python-dateutil==2.9.0.20241003
     # via arrow
 uri-template==1.3.0
     # via jsonschema

requirements/docs.txt

@@ -26,9 +26,9 @@ bleach==6.1.0
     # via nbconvert
 certifi==2024.8.30
     # via requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
-debugpy==1.8.6
+debugpy==1.8.7
     # via ipykernel
 defusedxml==0.7.1
     # via nbconvert
@@ -54,7 +54,7 @@ jinja2==3.1.4
     #   sphinx
 jsonschema==4.23.0
     # via nbformat
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via jsonschema
 jupyter-client==8.6.3
     # via
@@ -73,7 +73,7 @@ markdown-it-py==3.0.0
     # via
     #   mdit-py-plugins
     #   myst-parser
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
     #   jinja2
     #   nbconvert
@@ -106,7 +106,7 @@ platformdirs==4.3.6
     #   pooch
 pooch==1.8.2
     # via -r docs.in
-psutil==6.0.0
+psutil==6.1.0
     # via ipykernel
 pydata-sphinx-theme==0.15.4
     # via -r docs.in
@@ -130,7 +130,7 @@ snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.6
     # via beautifulsoup4
-sphinx==8.0.2
+sphinx==8.1.3
     # via
     #   -r docs.in
     #   myst-parser
@@ -139,7 +139,7 @@ sphinx==8.0.2
     #   sphinx-autodoc-typehints
     #   sphinx-copybutton
     #   sphinx-design
-sphinx-autodoc-typehints==2.4.4
+sphinx-autodoc-typehints==2.5.0
     # via -r docs.in
 sphinx-copybutton==0.5.2
     # via -r docs.in
@@ -159,7 +159,7 @@ sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 tinycss2==1.3.0
     # via nbconvert
-tomli==2.0.1
+tomli==2.0.2
     # via sphinx
 tornado==6.4.1
     # via

requirements/mypy.txt

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

requirements/nightly.in

@@ -7,6 +7,7 @@ graphviz
 pythreejs
 orsopy
 essreduce
+pandas
 plopp @ git+https://github.com/scipp/plopp@main
 sciline @ git+https://github.com/scipp/sciline@main
 scippneutron @ git+https://github.com/scipp/scippneutron@main