Skip to content

Commit

Permalink
Merge pull request #133 from scipp/load-choppers
Browse files Browse the repository at this point in the history
Load choppers and analysers
  • Loading branch information
jl-wynen authored Nov 22, 2024
2 parents 10de586 + ef9e639 commit e843d7a
Show file tree
Hide file tree
Showing 20 changed files with 500 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Common data reduction tools for the ESS facility
max_python: '3.13'
min_python: '3.10'
namespace_package: ess
nightly_deps: scippnexus,scipp,sciline,cyclebane
nightly_deps: scippnexus,scipp,sciline,cyclebane,scippneutron
orgname: scipp
prettyname: ESSreduce
projectname: essreduce
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ requires-python = ">=3.10"
dependencies = [
"sciline>=24.06.2",
"scipp>=24.02.0",
"scippneutron>=24.11.0",
"scippnexus>=24.11.0",
]

Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
sciline>=24.06.2
scipp>=24.02.0
scippneutron>=24.11.0
scippnexus>=24.11.0
49 changes: 43 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,69 @@
# SHA1:61ced0b7e1301f66609a2d72adaad2ad2e729000
# SHA1:41ad412be1c3ef8654797c35e9ebb78554531f85
#
# This file is autogenerated by pip-compile-multi
# To update, run:
#
# pip-compile-multi
#
contourpy==1.3.1
# via matplotlib
cyclebane==24.10.0
# via sciline
cycler==0.12.1
# via matplotlib
fonttools==4.55.0
# via matplotlib
h5py==3.12.1
# via scippnexus
# via
# scippneutron
# scippnexus
kiwisolver==1.4.7
# via matplotlib
matplotlib==3.9.2
# via
# mpltoolbox
# plopp
mpltoolbox==24.5.1
# via scippneutron
networkx==3.4.2
# via cyclebane
numpy==2.1.3
# via
# contourpy
# h5py
# matplotlib
# mpltoolbox
# scipp
# scippneutron
# scipy
packaging==24.2
# via matplotlib
pillow==11.0.0
# via matplotlib
plopp==24.10.0
# via scippneutron
pyparsing==3.2.0
# via matplotlib
python-dateutil==2.9.0.post0
# via scippnexus
sciline==24.6.3
# via
# matplotlib
# scippnexus
sciline==24.10.0
# via -r base.in
scipp==24.11.1
# via
# -r base.in
# scippneutron
# scippnexus
scippnexus==24.11.0
scippneutron==24.11.0
# via -r base.in
scippnexus==24.11.0
# via
# -r base.in
# scippneutron
scipy==1.14.1
# via scippnexus
# via
# scippneutron
# scippnexus
six==1.16.0
# via python-dateutil
6 changes: 3 additions & 3 deletions requirements/basetest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ ipython==8.29.0
# via ipywidgets
ipywidgets==8.1.5
# via -r basetest.in
jedi==0.19.1
jedi==0.19.2
# via ipython
jupyterlab-widgets==3.0.13
# via ipywidgets
matplotlib-inline==0.1.7
# via ipython
packaging==24.1
packaging==24.2
# via
# pooch
# pytest
Expand Down Expand Up @@ -65,7 +65,7 @@ six==1.16.0
# via asttokens
stack-data==0.6.3
# via ipython
tomli==2.0.2
tomli==2.1.0
# via pytest
traitlets==5.14.3
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gitpython==3.1.43
# via -r ci.in
idna==3.10
# via requests
packaging==24.1
packaging==24.2
# via
# -r ci.in
# pyproject-api
Expand All @@ -44,7 +44,7 @@ requests==2.32.3
# via -r ci.in
smmap==5.0.1
# via gitdb
tomli==2.0.2
tomli==2.1.0
# via
# pyproject-api
# tox
Expand Down
12 changes: 6 additions & 6 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ click==8.1.7
# pip-tools
copier==9.4.1
# via -r dev.in
dunamai==1.22.0
dunamai==1.23.0
# via copier
fqdn==1.5.1
# via jsonschema
funcy==2.0
# via copier
h11==0.14.0
# via httpcore
httpcore==1.0.6
httpcore==1.0.7
# via httpx
httpx==0.27.2
# via jupyterlab
isoduration==20.11.0
# via jsonschema
jinja2-ansible-filters==1.3.2
# via copier
json5==0.9.25
json5==0.9.28
# via jupyterlab-server
jsonpointer==3.0.0
# via jsonschema
Expand All @@ -71,7 +71,7 @@ jupyter-server==2.14.2
# notebook-shim
jupyter-server-terminals==0.5.3
# via jupyter-server
jupyterlab==4.3.0
jupyterlab==4.3.1
# via -r dev.in
jupyterlab-server==2.27.3
# via jupyterlab
Expand Down Expand Up @@ -123,11 +123,11 @@ types-python-dateutil==2.9.0.20241003
# via arrow
uri-template==1.3.0
# via jsonschema
webcolors==24.8.0
webcolors==24.11.1
# via jsonschema
websocket-client==1.8.0
# via jupyter-server
wheel==0.44.0
wheel==0.45.0
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
13 changes: 4 additions & 9 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ comm==0.2.2
# via
# ipykernel
# ipywidgets
debugpy==1.8.7
debugpy==1.8.8
# via ipykernel
decorator==5.1.1
# via ipython
Expand Down Expand Up @@ -67,7 +67,7 @@ ipython==8.29.0
# ipywidgets
ipywidgets==8.1.5
# via -r docs.in
jedi==0.19.1
jedi==0.19.2
# via ipython
jinja2==3.1.4
# via
Expand Down Expand Up @@ -127,11 +127,6 @@ nbsphinx==0.9.5
# via -r docs.in
nest-asyncio==1.6.0
# via ipykernel
packaging==24.1
# via
# ipykernel
# nbconvert
# sphinx
pandocfilters==1.5.1
# via nbconvert
parso==0.8.4
Expand Down Expand Up @@ -169,7 +164,7 @@ referencing==0.35.1
# jsonschema-specifications
requests==2.32.3
# via sphinx
rpds-py==0.20.1
rpds-py==0.21.0
# via
# jsonschema
# referencing
Expand Down Expand Up @@ -208,7 +203,7 @@ stack-data==0.6.3
# via ipython
tinycss2==1.4.0
# via nbconvert
tomli==2.0.2
tomli==2.1.0
# via sphinx
tornado==6.4.1
# via
Expand Down
5 changes: 5 additions & 0 deletions requirements/nightly.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@

# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
ipywidgets
pooch
pytest
scippnexus @ git+https://github.com/scipp/scippnexus@main
scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
sciline @ git+https://github.com/scipp/sciline@main
cyclebane @ git+https://github.com/scipp/cyclebane@main
scippneutron @ git+https://github.com/scipp/scippneutron@main
Loading

0 comments on commit e843d7a

Please sign in to comment.