Merge pull request #162 from scipp/add-essreduce-nightly

Add essreduce to nightly deps list
scipp · Aug 26, 2024 · a93f4a2 · a93f4a2
2 parents dde89ff + 7bd5a9e
commit a93f4a2
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 14 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,13 +1,13 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: f1f814f
+_commit: bd9d844
 _src_path: gh:scipp/copier_template
 description: SANS data reduction for the European Spallation Source
 max_python: '3.12'
 min_python: '3.10'
 namespace_package: ess
-nightly_deps: plopp,sciline,scippneutron,scippnexus,scipp
+nightly_deps: plopp,sciline,scippneutron,scippnexus,scipp,essreduce
 orgname: scipp
 prettyname: ESSsans
 projectname: esssans
-related_projects: Scipp,ScippNexus,ScippNeutron,Sciline,Plopp
+related_projects: Scipp,ScippNexus,ScippNeutron,Sciline,Plopp,ESSreduce
 year: 2024
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -106,7 +106,7 @@ pure-eval==0.2.3
     # via stack-data
 pygments==2.18.0
     # via ipython
-pyparsing==3.1.2
+pyparsing==3.1.4
     # via matplotlib
 python-dateutil==2.9.0.post0
     # via

diff --git a/requirements/basetest.in b/requirements/basetest.in
@@ -1,5 +1,7 @@
 # Dependencies that are only used by tests.
 # Do not make an environment from this file, use test.txt instead!
+# Add more dependencies in the ``test`` list
+# under ``[project.optional-dependencies]`` section, in ``pyproject.toml``
 
 # Anything above "--- END OF CUSTOM SECTION ---"
 # will not be touched by ``make_base.py``

diff --git a/requirements/basetest.txt b/requirements/basetest.txt
@@ -11,7 +11,7 @@ charset-normalizer==3.3.2
     # via requests
 exceptiongroup==1.2.2
     # via pytest
-idna==3.7
+idna==3.8
     # via requests
 iniconfig==2.0.0
     # via pytest

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -25,7 +25,7 @@ gitdb==4.0.11
     # via gitpython
 gitpython==3.1.43
     # via -r ci.in
-idna==3.7
+idna==3.8
     # via requests
 packaging==24.1
     # via

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -40,7 +40,7 @@ docutils==0.21.2
     #   sphinx
 fastjsonschema==2.20.0
     # via nbformat
-idna==3.7
+idna==3.8
     # via requests
 imagesize==1.4.1
     # via sphinx

diff --git a/requirements/mypy.txt b/requirements/mypy.txt
@@ -6,7 +6,7 @@
 #    pip-compile-multi
 #
 -r test.txt
-mypy==1.11.1
+mypy==1.11.2
     # via -r mypy.in
 mypy-extensions==1.0.0
     # via mypy
diff --git a/requirements/nightly.in b/requirements/nightly.in
@@ -3,7 +3,6 @@
 # The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
 dask
 graphviz
-essreduce>=24.08.0
 numpy
 pandas
 pythreejs
@@ -12,3 +11,4 @@ sciline @ git+https://github.com/scipp/sciline@main
 scippneutron @ git+https://github.com/scipp/scippneutron@main
 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
+essreduce @ git+https://github.com/scipp/essreduce@main
diff --git a/requirements/nightly.txt b/requirements/nightly.txt
@@ -1,4 +1,4 @@
-# SHA1:be43a5b1af4d72a551d58901efa7bd4bb2c460ff
+# SHA1:ed858c037dfb1a6903581eae7eba3b4ad493971f
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -24,7 +24,7 @@ dask==2024.8.1
     # via -r nightly.in
 decorator==5.1.1
     # via ipython
-essreduce==24.8.0
+essreduce @ git+https://github.com/scipp/essreduce@main
     # via -r nightly.in
 executing==2.0.1
     # via stack-data
@@ -101,7 +101,7 @@ pure-eval==0.2.3
     # via stack-data
 pygments==2.18.0
     # via ipython
-pyparsing==3.1.2
+pyparsing==3.1.4
     # via matplotlib
 python-dateutil==2.9.0.post0
     # via
@@ -115,7 +115,9 @@ pytz==2024.1
 pyyaml==6.0.2
     # via dask
 sciline @ git+https://github.com/scipp/sciline@main
-    # via -r nightly.in
+    # via
+    #   -r nightly.in
+    #   essreduce
 scipp @ https://github.com/scipp/scipp/releases/download/nightly/scipp-nightly-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
     # via
     #   -r nightly.in

diff --git a/tox.ini b/tox.ini
@@ -63,5 +63,5 @@ deps =
   tomli
 skip_install = true
 changedir = requirements
-commands = python ./make_base.py --nightly plopp,sciline,scippneutron,scippnexus,scipp
+commands = python ./make_base.py --nightly plopp,sciline,scippneutron,scippnexus,scipp,essreduce
            pip-compile-multi -d . --backtracking