Skip to content

Commit 8d4d537

Browse files
authored
Merge pull request #193 from scipp/python311
Drop python 3.10 support
2 parents 621d197 + b1a8e30 commit 8d4d537

File tree

18 files changed

+90
-145
lines changed

18 files changed

+90
-145
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ _commit: 3f79959
33
_src_path: gh:scipp/copier_template
44
description: Diffraction data reduction for the European Spallation Source
55
max_python: '3.13'
6-
min_python: '3.10'
6+
min_python: '3.11'
77
namespace_package: ess
88
nightly_deps: scipp,scippnexus,sciline,plopp,scippneutron,essreduce,tof
99
orgname: scipp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10
1+
3.11

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10
1+
3.11

docs/developer/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Alternatively, if you want a different workflow, take a look at ``tox.ini`` or `
4040
Run the tests using
4141
4242
```sh
43-
tox -e py310
43+
tox -e py311
4444
```
4545
4646
(or just `tox` if you want to run all environments).

docs/user-guide/dream/dream-instrument-view.ipynb

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,9 @@
140140
"full_view"
141141
]
142142
},
143-
{
144-
"cell_type": "code",
145-
"execution_count": null,
146-
"id": "9",
147-
"metadata": {
148-
"editable": true,
149-
"nbsphinx": "hidden",
150-
"slideshow": {
151-
"slide_type": ""
152-
},
153-
"tags": []
154-
},
155-
"outputs": [],
156-
"source": [
157-
"full_view[2].controls[\"tof\"][\"slider\"].value = 35\n",
158-
"full_view[1].toolbar.tools[\"autoscale\"].click()"
159-
]
160-
},
161143
{
162144
"cell_type": "markdown",
163-
"id": "10",
145+
"id": "9",
164146
"metadata": {
165147
"editable": true,
166148
"slideshow": {
@@ -179,7 +161,7 @@
179161
{
180162
"cell_type": "code",
181163
"execution_count": null,
182-
"id": "11",
164+
"id": "10",
183165
"metadata": {
184166
"editable": true,
185167
"slideshow": {
@@ -193,27 +175,9 @@
193175
"mantle_view"
194176
]
195177
},
196-
{
197-
"cell_type": "code",
198-
"execution_count": null,
199-
"id": "12",
200-
"metadata": {
201-
"editable": true,
202-
"nbsphinx": "hidden",
203-
"slideshow": {
204-
"slide_type": ""
205-
},
206-
"tags": []
207-
},
208-
"outputs": [],
209-
"source": [
210-
"mantle_view[1].controls[\"tof\"][\"slider\"].value = 43\n",
211-
"mantle_view[0].toolbar.tools[\"autoscale\"].click()"
212-
]
213-
},
214178
{
215179
"cell_type": "markdown",
216-
"id": "13",
180+
"id": "11",
217181
"metadata": {},
218182
"source": [
219183
"The instrument view is designed to be flexible in terms of what it accepts as input.\n",
@@ -225,7 +189,7 @@
225189
{
226190
"cell_type": "code",
227191
"execution_count": null,
228-
"id": "14",
192+
"id": "12",
229193
"metadata": {},
230194
"outputs": [],
231195
"source": [

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ classifiers = [
1818
"Operating System :: OS Independent",
1919
"Programming Language :: Python :: 3",
2020
"Programming Language :: Python :: 3 :: Only",
21-
"Programming Language :: Python :: 3.10",
2221
"Programming Language :: Python :: 3.11",
2322
"Programming Language :: Python :: 3.12",
2423
"Programming Language :: Python :: 3.13",
2524
"Topic :: Scientific/Engineering",
2625
"Typing :: Typed",
2726
]
28-
requires-python = ">=3.10"
27+
requires-python = ">=3.11"
2928

3029
# IMPORTANT:
3130
# Run 'tox -e deps' after making changes here. This will update requirement files.

requirements/base.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# SHA1:8f044677d4db96fd48743befd036bb0b7410e72f
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
annotated-types==0.7.0
99
# via pydantic
@@ -13,9 +13,9 @@ click==8.2.1
1313
# via dask
1414
cloudpickle==3.1.1
1515
# via dask
16-
comm==0.2.2
16+
comm==0.2.3
1717
# via ipywidgets
18-
contourpy==1.3.2
18+
contourpy==1.3.3
1919
# via matplotlib
2020
cyclebane==24.10.0
2121
# via sciline
@@ -29,15 +29,13 @@ dnspython==2.7.0
2929
# via email-validator
3030
email-validator==2.2.0
3131
# via scippneutron
32-
essreduce==25.7.0
32+
essreduce==25.7.1
3333
# via -r base.in
34-
exceptiongroup==1.3.0
35-
# via ipython
3634
executing==2.2.0
3735
# via stack-data
38-
fonttools==4.58.5
36+
fonttools==4.59.0
3937
# via matplotlib
40-
fsspec==2025.5.1
38+
fsspec==2025.7.0
4139
# via dask
4240
graphviz==0.21
4341
# via -r base.in
@@ -51,8 +49,10 @@ importlib-metadata==8.7.0
5149
# via dask
5250
ipydatawidgets==4.3.5
5351
# via pythreejs
54-
ipython==8.37.0
52+
ipython==9.4.0
5553
# via ipywidgets
54+
ipython-pygments-lexers==1.1.1
55+
# via ipython
5656
ipywidgets==8.1.7
5757
# via
5858
# ipydatawidgets
@@ -70,17 +70,17 @@ lazy-loader==0.4
7070
# tof
7171
locket==1.0.0
7272
# via partd
73-
matplotlib==3.10.3
73+
matplotlib==3.10.5
7474
# via
7575
# mpltoolbox
7676
# plopp
7777
matplotlib-inline==0.1.7
7878
# via ipython
7979
mpltoolbox==25.5.0
8080
# via scippneutron
81-
networkx==3.4.2
81+
networkx==3.5
8282
# via cyclebane
83-
numpy==2.2.6
83+
numpy==2.3.2
8484
# via
8585
# -r base.in
8686
# contourpy
@@ -104,7 +104,7 @@ pexpect==4.9.0
104104
# via ipython
105105
pillow==11.3.0
106106
# via matplotlib
107-
plopp==25.6.1
107+
plopp==25.7.1
108108
# via
109109
# -r base.in
110110
# scippneutron
@@ -120,7 +120,9 @@ pydantic==2.11.7
120120
pydantic-core==2.33.2
121121
# via pydantic
122122
pygments==2.19.2
123-
# via ipython
123+
# via
124+
# ipython
125+
# ipython-pygments-lexers
124126
pyparsing==3.2.3
125127
# via matplotlib
126128
python-dateutil==2.9.0.post0
@@ -152,7 +154,7 @@ scippnexus==25.6.0
152154
# -r base.in
153155
# essreduce
154156
# scippneutron
155-
scipy==1.15.3
157+
scipy==1.16.1
156158
# via
157159
# scippneutron
158160
# scippnexus
@@ -169,7 +171,6 @@ toolz==1.0.0
169171
# partd
170172
traitlets==5.14.3
171173
# via
172-
# comm
173174
# ipython
174175
# ipywidgets
175176
# matplotlib-inline
@@ -179,7 +180,6 @@ traittypes==0.2.1
179180
# via ipydatawidgets
180181
typing-extensions==4.14.1
181182
# via
182-
# exceptiongroup
183183
# ipython
184184
# pydantic
185185
# pydantic-core

requirements/basetest.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
# SHA1:c4f3e9aaa3abd10fcdf497bea14415857f62cc89
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
8-
certifi==2025.7.14
8+
certifi==2025.8.3
99
# via requests
1010
charset-normalizer==3.4.2
1111
# via requests
12-
exceptiongroup==1.3.0
13-
# via pytest
1412
idna==3.10
1513
# via requests
1614
iniconfig==2.1.0
1715
# via pytest
18-
numpy==2.2.6
16+
numpy==2.3.2
1917
# via pandas
2018
packaging==25.0
2119
# via
@@ -41,10 +39,6 @@ requests==2.32.4
4139
# via pooch
4240
six==1.17.0
4341
# via python-dateutil
44-
tomli==2.2.1
45-
# via pytest
46-
typing-extensions==4.14.1
47-
# via exceptiongroup
4842
tzdata==2025.2
4943
# via pandas
5044
urllib3==2.5.0

requirements/ci.txt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
# SHA1:6344d52635ea11dca331a3bc6eb1833c4c64d585
22
#
3-
# This file is autogenerated by pip-compile-multi
3+
# This file was generated by pip-compile-multi.
44
# To update, run:
55
#
6-
# pip-compile-multi
6+
# requirements upgrade
77
#
88
cachetools==6.1.0
99
# via tox
10-
certifi==2025.7.14
10+
certifi==2025.8.3
1111
# via requests
1212
chardet==5.2.0
1313
# via tox
1414
charset-normalizer==3.4.2
1515
# via requests
1616
colorama==0.4.6
1717
# via tox
18-
distlib==0.3.9
18+
distlib==0.4.0
1919
# via virtualenv
2020
filelock==3.18.0
2121
# via
2222
# tox
2323
# virtualenv
2424
gitdb==4.0.12
2525
# via gitpython
26-
gitpython==3.1.44
26+
gitpython==3.1.45
2727
# via -r ci.in
2828
idna==3.10
2929
# via requests
@@ -44,15 +44,9 @@ requests==2.32.4
4444
# via -r ci.in
4545
smmap==5.0.2
4646
# via gitdb
47-
tomli==2.2.1
48-
# via
49-
# pyproject-api
50-
# tox
51-
tox==4.27.0
47+
tox==4.28.4
5248
# via -r ci.in
53-
typing-extensions==4.14.1
54-
# via tox
5549
urllib3==2.5.0
5650
# via requests
57-
virtualenv==20.31.2
51+
virtualenv==20.33.1
5852
# via tox

0 commit comments

Comments
 (0)