Skip to content

Add lower pins #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 6, 2025
Merged

Add lower pins #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
196f15a
copier update
jokasimr Jul 15, 2025
ebde0fb
deps: add lower bounds
jokasimr Jul 15, 2025
76a6b46
tox -e deps
jokasimr Jul 15, 2025
959b7ee
deps: earlier dask pin
jokasimr Jul 16, 2025
f84bead
tox -e deps
jokasimr Jul 16, 2025
135b3a7
deps: relax pandas
jokasimr Jul 16, 2025
c57a290
tox -e deps
jokasimr Jul 16, 2025
b009d14
Merge branch 'main' into add-lower-pins
nvaytet Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .copier-answers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 3f79959
_commit: 3561fcd
_src_path: gh:scipp/copier_template
description: Diffraction data reduction for the European Spallation Source
max_python: '3.13'
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/nightly_at_main_lower_bound.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Nightly test using lower bound dependencies

on:
workflow_dispatch:
schedule:
- cron: '30 1 * * 1-5'

jobs:
setup:
name: Setup variables
runs-on: 'ubuntu-24.04'
outputs:
min_python: ${{ steps.vars.outputs.min_python }}
steps:
- uses: actions/checkout@v4
- name: Get Python version for other CI jobs
id: vars
run: echo "min_python=$(< .github/workflows/python-version-ci)" >> "$GITHUB_OUTPUT"

tests:
name: Tests at lower bound
needs: setup
strategy:
matrix:
os: ['ubuntu-24.04']
python:
- version: '${{needs.setup.outputs.min_python}}'
runs-on: ${{ matrix.os }}
env:
ESS_PROTECTED_FILESTORE_USERNAME: ${{ secrets.ESS_PROTECTED_FILESTORE_USERNAME }}
ESS_PROTECTED_FILESTORE_PASSWORD: ${{ secrets.ESS_PROTECTED_FILESTORE_PASSWORD }}
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v6
with:
python-version: ${{ matrix.python.version }}
- run: uv run --extra=test --resolution=lowest-direct pytest
4 changes: 2 additions & 2 deletions docs/about/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

## Development

ESSdiffraction is an open source project by the [European Spallation Source ERIC](https://europeanspallationsource.se/) (ESS).
ESSdiffraction is an open source project by the [European Spallation Source ERIC](https://ess.eu/) (ESS).

## License

ESSdiffraction is available as open source under the [BSD-3 license](https://opensource.org/licenses/BSD-3-Clause).
ESSdiffraction is available as open source under the [BSD-3 license](https://opensource.org/license/BSD-3-Clause).

## Citing ESSdiffraction

Expand Down
30 changes: 15 additions & 15 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@
html_show_sourcelink = True

extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.autosummary",
"sphinx.ext.doctest",
"sphinx.ext.githubpages",
"sphinx.ext.intersphinx",
"sphinx.ext.mathjax",
"sphinx.ext.napoleon",
"sphinx.ext.viewcode",
"sphinx_autodoc_typehints",
"sphinx_copybutton",
"sphinx_design",
"sphinxcontrib.autodoc_pydantic",
"sphinxcontrib.bibtex",
"nbsphinx",
"myst_parser",
'sphinx.ext.autodoc',
'sphinx.ext.autosummary',
'sphinx.ext.doctest',
'sphinx.ext.githubpages',
'sphinx.ext.intersphinx',
'sphinx.ext.mathjax',
'sphinx.ext.napoleon',
'sphinx.ext.viewcode',
'sphinx_autodoc_typehints',
'sphinx_copybutton',
'sphinx_design',
'sphinxcontrib.autodoc_pydantic',
'sphinxcontrib.bibtex',
'nbsphinx',
'myst_parser',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That change came from the copier update

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so. Did you resolve a conflict for this? It looks like the quotes were changed in ESSdiffraction at some point.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah there was a conflict, I resolved it by changing the quotes to be like in copier_template and keep sphinxcobtrib.bibtex that was not in the list from copier_template

]

try:
Expand Down
15 changes: 8 additions & 7 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ requires-python = ">=3.11"
# Run 'tox -e deps' after making changes here. This will update requirement files.
# Make sure to list one dependency per line.
dependencies = [
"dask",
"dask>=2022.1.0",
"essreduce>=25.07.0",
"graphviz",
"numpy",
"plopp>=25.03.0",
"pythreejs",
"numpy>=1.25",
"plopp>=25.07.0",
"pythreejs>=2.4.1",
"sciline>=25.04.1",
"scipp>=25.05.1",
"scippneutron>=25.02.0",
Expand All @@ -47,9 +47,10 @@ dynamic = ["version"]

[project.optional-dependencies]
test = [
"pandas",
"pooch",
"pytest",
"pandas>=2.1.2",
"pooch>=1.5",
"pytest>=7.0",
"ipywidgets>=8.1.7"
]

[project.urls]
Expand Down
8 changes: 4 additions & 4 deletions requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# will not be touched by ``make_base.py``
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
dask>=2022.1.0
essreduce>=25.07.0
graphviz
numpy
plopp>=25.03.0
pythreejs
numpy>=1.25
plopp>=25.07.0
pythreejs>=2.4.1
sciline>=25.04.1
scipp>=25.05.1
scippneutron>=25.02.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:8f044677d4db96fd48743befd036bb0b7410e72f
# SHA1:14c6bcb4e6d6485d81209545674ad66d2bd9f82f
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand Down
7 changes: 4 additions & 3 deletions requirements/basetest.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# will not be touched by ``make_base.py``
# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
pandas
pooch
pytest
pandas>=2.1.2
pooch>=1.5
pytest>=7.0
ipywidgets>=8.1.7
50 changes: 48 additions & 2 deletions requirements/basetest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
# SHA1:c4f3e9aaa3abd10fcdf497bea14415857f62cc89
# SHA1:7f34665dae8380142bc93ee5745242a803a4e60c
#
# This file was generated by pip-compile-multi.
# To update, run:
#
# requirements upgrade
#
asttokens==3.0.0
# via stack-data
certifi==2025.8.3
# via requests
charset-normalizer==3.4.2
# via requests
comm==0.2.3
# via ipywidgets
decorator==5.2.1
# via ipython
executing==2.2.0
# via stack-data
idna==3.10
# via requests
iniconfig==2.1.0
# via pytest
ipython==9.4.0
# via ipywidgets
ipython-pygments-lexers==1.1.1
# via ipython
ipywidgets==8.1.7
# via -r basetest.in
jedi==0.19.2
# via ipython
jupyterlab-widgets==3.0.15
# via ipywidgets
matplotlib-inline==0.1.7
# via ipython
numpy==2.3.2
# via pandas
packaging==25.0
Expand All @@ -21,14 +41,27 @@ packaging==25.0
# pytest
pandas==2.3.1
# via -r basetest.in
parso==0.8.4
# via jedi
pexpect==4.9.0
# via ipython
platformdirs==4.3.8
# via pooch
pluggy==1.6.0
# via pytest
pooch==1.8.2
# via -r basetest.in
prompt-toolkit==3.0.51
# via ipython
ptyprocess==0.7.0
# via pexpect
pure-eval==0.2.3
# via stack-data
pygments==2.19.2
# via pytest
# via
# ipython
# ipython-pygments-lexers
# pytest
pytest==8.4.1
# via -r basetest.in
python-dateutil==2.9.0.post0
Expand All @@ -39,7 +72,20 @@ requests==2.32.4
# via pooch
six==1.17.0
# via python-dateutil
stack-data==0.6.3
# via ipython
traitlets==5.14.3
# via
# ipython
# ipywidgets
# matplotlib-inline
typing-extensions==4.14.1
# via ipython
tzdata==2025.2
# via pandas
urllib3==2.5.0
# via requests
wcwidth==0.2.13
# via prompt-toolkit
widgetsnbextension==4.0.14
# via ipywidgets
13 changes: 7 additions & 6 deletions requirements/nightly.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@

# --- END OF CUSTOM SECTION ---
# The following was generated by 'tox -e deps', DO NOT EDIT MANUALLY!
dask
dask>=2022.1.0
graphviz
numpy
pythreejs
pandas
pooch
pytest
numpy>=1.25
pythreejs>=2.4.1
pandas>=2.1.2
pooch>=1.5
pytest>=7.0
ipywidgets>=8.1.7
scipp
--index-url=https://pypi.anaconda.org/scipp-nightly-wheels/simple/
--extra-index-url=https://pypi.org/simple
Expand Down
3 changes: 2 additions & 1 deletion requirements/nightly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SHA1:366263fa92dc0eb9f81d46f056e0c80a931f671e
# SHA1:10d896bcca3d382aa5b0e4215a8175e9d33097fb
#
# This file was generated by pip-compile-multi.
# To update, run:
Expand Down Expand Up @@ -66,6 +66,7 @@ ipython-pygments-lexers==1.1.1
# via ipython
ipywidgets==8.1.7
# via
# -r nightly.in
# ipydatawidgets
# pythreejs
jedi==0.19.2
Expand Down
Loading