Merge pull request #63 from scipp/next-sciline

Update for next version of Sciline

Author: SimonHeybrock

docs/api-reference/index.md

@@ -10,6 +10,7 @@
    :toctree: ../generated/attributes
 
    providers
+   with_pixel_mask_filenames
 ```
 
 ### Submodules

docs/user-guide/dream/dream-data-reduction.ipynb

@@ -53,6 +53,8 @@
     "    # Mask in time-of-flight to crop to valid range\n",
     "    TofMask: lambda x: (x < sc.scalar(0.0, unit=\"ns\"))\n",
     "    | (x > sc.scalar(86e6, unit=\"ns\")),\n",
+    "    TwoThetaMask: None,\n",
+    "    WavelengthMask: None,\n",
     "}\n",
     "\n",
     "# Not available in simulated data\n",
@@ -91,7 +93,8 @@
     "    *powder.providers,\n",
     ")\n",
     "\n",
-    "pipeline = sciline.Pipeline(providers, params=params)"
+    "pipeline = sciline.Pipeline(providers, params=params)\n",
+    "pipeline = powder.with_pixel_mask_filenames(pipeline, [])"
    ]
   },
   {
@@ -282,7 +285,8 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,

docs/user-guide/sns-instruments/POWGEN_data_reduction.ipynb

@@ -62,6 +62,8 @@
     "    # Mask in time-of-flight to crop to valid range\n",
     "    TofMask: lambda x: (x < sc.scalar(0.0, unit=\"us\"))\n",
     "    | (x > sc.scalar(16666.67, unit=\"us\")),\n",
+    "    TwoThetaMask: None,\n",
+    "    WavelengthMask: None,\n",
     "}"
    ]
   },
@@ -83,7 +85,8 @@
    "outputs": [],
    "source": [
     "providers = [*powder.providers, *powgen.providers]\n",
-    "pipeline = sciline.Pipeline(providers, params=params)"
+    "pipeline = sciline.Pipeline(providers, params=params)\n",
+    "pipeline = powder.with_pixel_mask_filenames(pipeline, [])"
    ]
   },
   {
@@ -382,7 +385,8 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3"
+   "pygments_lexer": "ipython3",
+   "version": "3.10.12"
   }
  },
  "nbformat": 4,

pyproject.toml

@@ -33,9 +33,10 @@ dependencies = [
   "dask",
   "essreduce",
   "graphviz",
+  "numpy<2.0.0",
   "plopp",
   "pythreejs",
-  "sciline>=23.9.1",
+  "sciline>=24.06.0",
   "scipp>=23.8.0",
   "scippneutron>=23.9.0",
   "scippnexus>=23.12.0",

requirements/base.in

@@ -5,9 +5,10 @@
 dask
 essreduce
 graphviz
+numpy<2.0.0
 plopp
 pythreejs
-sciline>=23.9.1
+sciline>=24.06.0
 scipp>=23.8.0
 scippneutron>=23.9.0
 scippnexus>=23.12.0

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:29c507e8f357aa38ed2ac5c664d04a700311abaa
+# SHA1:4c50d46537635c6b5484ebc2993aec09597baf9c
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -7,7 +7,7 @@
 #
 asttokens==2.4.1
     # via stack-data
-certifi==2024.2.2
+certifi==2024.6.2
     # via requests
 charset-normalizer==3.3.2
     # via requests
@@ -19,19 +19,23 @@ comm==0.2.2
     # via ipywidgets
 contourpy==1.2.1
     # via matplotlib
+cyclebane==24.6.0
+    # via sciline
 cycler==0.12.1
     # via matplotlib
-dask==2024.5.1
+dask==2024.6.0
     # via -r base.in
 decorator==5.1.1
     # via ipython
 essreduce==24.3.11
     # via -r base.in
+exceptiongroup==1.2.1
+    # via ipython
 executing==2.0.1
     # via stack-data
-fonttools==4.52.4
+fonttools==4.53.0
     # via matplotlib
-fsspec==2024.5.0
+fsspec==2024.6.0
     # via dask
 graphviz==0.20.3
     # via -r base.in
@@ -41,9 +45,11 @@ h5py==3.11.0
     #   scippnexus
 idna==3.7
     # via requests
+importlib-metadata==7.1.0
+    # via dask
 ipydatawidgets==4.3.5
     # via pythreejs
-ipython==8.24.0
+ipython==8.25.0
     # via ipywidgets
 ipywidgets==8.1.3
     # via
@@ -61,8 +67,11 @@ matplotlib==3.9.0
     # via plopp
 matplotlib-inline==0.1.7
     # via ipython
+networkx==3.3
+    # via cyclebane
 numpy==1.26.4
     # via
+    #   -r base.in
     #   contourpy
     #   h5py
     #   ipydatawidgets
@@ -71,7 +80,7 @@ numpy==1.26.4
     #   scipp
     #   scippneutron
     #   scipy
-packaging==24.0
+packaging==24.1
     # via
     #   dask
     #   matplotlib
@@ -90,9 +99,9 @@ plopp==24.5.0
     # via
     #   -r base.in
     #   scippneutron
-pooch==1.8.1
+pooch==1.8.2
     # via scippneutron
-prompt-toolkit==3.0.45
+prompt-toolkit==3.0.47
     # via ipython
 ptyprocess==0.7.0
     # via pexpect
@@ -110,9 +119,9 @@ pythreejs==2.4.2
     # via -r base.in
 pyyaml==6.0.1
     # via dask
-requests==2.32.2
+requests==2.32.3
     # via pooch
-sciline==24.4.1
+sciline==24.6.0
     # via -r base.in
 scipp==24.5.1
     # via
@@ -151,9 +160,13 @@ traitlets==5.14.3
     #   traittypes
 traittypes==0.2.1
     # via ipydatawidgets
+typing-extensions==4.12.2
+    # via ipython
 urllib3==2.2.1
     # via requests
 wcwidth==0.2.13
     # via prompt-toolkit
 widgetsnbextension==4.0.11
     # via ipywidgets
+zipp==3.19.2
+    # via importlib-metadata

requirements/basetest.in

@@ -1,5 +1,6 @@
 # Dependencies that are only used by tests.
 # Do not make an environment from this file, use test.txt instead!
 
+numpy<2.0.0
 pandas
 pytest

requirements/basetest.txt

@@ -1,4 +1,4 @@
-# SHA1:2da4cc17c82e9ac0b3764abd55420a1e9d217c9d
+# SHA1:1199eb6a71c82d0580b7a1a4178e0c3586ed7e67
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -10,14 +10,16 @@ exceptiongroup==1.2.1
 iniconfig==2.0.0
     # via pytest
 numpy==1.26.4
-    # via pandas
-packaging==24.0
+    # via
+    #   -r basetest.in
+    #   pandas
+packaging==24.1
     # via pytest
 pandas==2.2.2
     # via -r basetest.in
 pluggy==1.5.0
     # via pytest
-pytest==8.2.1
+pytest==8.2.2
     # via -r basetest.in
 python-dateutil==2.9.0.post0
     # via pandas

requirements/ci.txt

@@ -7,7 +7,7 @@
 #
 cachetools==5.3.3
     # via tox
-certifi==2024.2.2
+certifi==2024.6.2
     # 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.14.0
+filelock==3.15.1
     # via
     #   tox
     #   virtualenv
@@ -27,7 +27,7 @@ gitpython==3.1.43
     # via -r ci.in
 idna==3.7
     # via requests
-packaging==24.0
+packaging==24.1
     # via
     #   -r ci.in
     #   pyproject-api
@@ -40,15 +40,15 @@ pluggy==1.5.0
     # via tox
 pyproject-api==1.6.1
     # via tox
-requests==2.32.2
+requests==2.32.3
     # via -r ci.in
 smmap==5.0.1
     # via gitdb
 tomli==2.0.1
     # via
     #   pyproject-api
     #   tox
-tox==4.15.0
+tox==4.15.1
     # via -r ci.in
 urllib3==2.2.1
     # via requests

requirements/dev.txt

@@ -48,7 +48,7 @@ jinja2-ansible-filters==1.3.2
     # via copier
 json5==0.9.25
     # via jupyterlab-server
-jsonpointer==2.4
+jsonpointer==3.0.0
     # via jsonschema
 jsonschema[format-nongpl]==4.22.0
     # via
@@ -59,15 +59,15 @@ jupyter-events==0.10.0
     # via jupyter-server
 jupyter-lsp==2.2.5
     # via jupyterlab
-jupyter-server==2.14.0
+jupyter-server==2.14.1
     # via
     #   jupyter-lsp
     #   jupyterlab
     #   jupyterlab-server
     #   notebook-shim
 jupyter-server-terminals==0.5.3
     # via jupyter-server
-jupyterlab==4.2.1
+jupyterlab==4.2.2
     # via -r dev.in
 jupyterlab-server==2.27.2
     # via jupyterlab
@@ -77,7 +77,7 @@ overrides==7.7.0
     # via jupyter-server
 pathspec==0.12.1
     # via copier
-pip-compile-multi==2.6.3
+pip-compile-multi==2.6.4
     # via -r dev.in
 pip-tools==7.4.1
     # via pip-compile-multi
@@ -87,9 +87,9 @@ prometheus-client==0.20.0
     # via jupyter-server
 pycparser==2.22
     # via cffi
-pydantic==2.7.2
+pydantic==2.7.4
     # via copier
-pydantic-core==2.18.3
+pydantic-core==2.18.4
     # via pydantic
 python-json-logger==2.0.7
     # via jupyter-events
@@ -119,7 +119,7 @@ types-python-dateutil==2.9.0.20240316
     # via arrow
 uri-template==1.3.0
     # via jsonschema
-webcolors==1.13
+webcolors==24.6.0
     # via jsonschema
 websocket-client==1.8.0
     # via jupyter-server

requirements/docs.txt

@@ -34,7 +34,7 @@ docutils==0.21.2
     #   nbsphinx
     #   pydata-sphinx-theme
     #   sphinx
-fastjsonschema==2.19.1
+fastjsonschema==2.20.0
     # via nbformat
 imagesize==1.4.1
     # via sphinx
@@ -133,7 +133,7 @@ sphinx==7.3.7
     #   sphinx-autodoc-typehints
     #   sphinx-copybutton
     #   sphinx-design
-sphinx-autodoc-typehints==2.1.0
+sphinx-autodoc-typehints==2.1.1
     # via -r docs.in
 sphinx-copybutton==0.5.2
     # via -r docs.in
@@ -155,7 +155,7 @@ tinycss2==1.3.0
     # via nbconvert
 tomli==2.0.1
     # via sphinx
-tornado==6.4
+tornado==6.4.1
     # via
     #   ipykernel
     #   jupyter-client

requirements/nightly.in

@@ -4,6 +4,7 @@
 dask
 essreduce
 graphviz
+numpy<2.0.0
 pythreejs
 https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
 scippnexus @ git+https://github.com/scipp/scippnexus@main