Skip to content

Commit 10ad914

Browse files
Merge pull request #438 from scipp/deprecate-loadnexus
Add deprecation warning to `load_nexus`
2 parents fd29e12 + 8b1aa34 commit 10ad914

File tree

14 files changed

+42
-38
lines changed

14 files changed

+42
-38
lines changed

.buildconfig/ci-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies:
2424
- python-graphviz==0.20.1
2525
- pythreejs==2.4.2
2626
- scipp==23.07.0
27-
- scippnexus==23.07.0
27+
- scippnexus==23.08.0
2828
- scipy==1.10.1
2929
- tox==4.3.5
3030

.buildconfig/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ dependencies:
1717
- pytest-asyncio==0.21.0
1818
- pythreejs==2.4.2
1919
- scipp==23.07.0
20-
- scippnexus==23.07.0
20+
- scippnexus==23.08.0
2121
- scipy==1.10.1

.buildconfig/ci-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ dependencies:
1717
- pytest-asyncio==0.21.0
1818
- pythreejs==2.4.2
1919
- scipp==23.07.0
20-
- scippnexus==23.07.0
20+
- scippnexus==23.08.0
2121
- scipy==1.10.1

conda/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ requirements:
3232
- pooch
3333
- python
3434
- scipp>=23.07.0
35-
- scippnexus>=23.03.0
35+
- scippnexus>=23.08.0
3636
- scipy>=1.7.0
3737

3838
test:

docs/about/release-notes.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Release Notes
2727
Stability, Maintainability, and Testing
2828
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2929
30-
v0.xy.0 (Unreleased)
31-
--------------------
30+
v23.08.0 (August 2023)
31+
----------------------
3232

3333
Features
3434
~~~~~~~~
@@ -46,13 +46,13 @@ Breaking changes
4646
Bugfixes
4747
~~~~~~~~
4848

49-
Documentation
50-
~~~~~~~~~~~~~
49+
* Fix compatibility with ScippNexus 23.08 `#438 <https://github.com/scipp/scippneutron/pull/438>`_.
5150

5251
Deprecations
5352
~~~~~~~~~~~~
5453

5554
* Deprecated ``scipneutron.load`` in favor of :func:`scippneutron.load_with_mantid` `#436 <https://github.com/scipp/scippneutron/pull/436>`_.
55+
* Deprecated ``scipneutron.load_nexus`` in favor of ScippNexus `#438 <https://github.com/scipp/scippneutron/pull/438>`_.
5656

5757
Stability, Maintainability, and Testing
5858
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies = [
3131
"numpy>=1.20",
3232
"pooch",
3333
"scipp>=23.07.0",
34-
"scippnexus>=23.3.0",
34+
"scippnexus>=23.8.0",
3535
"scipy>=1.7.0",
3636
]
3737

@@ -93,4 +93,5 @@ filterwarnings = [
9393
'ignore:Widget._widget_types is deprecated:DeprecationWarning',
9494
'ignore:Widget.widget_types is deprecated:DeprecationWarning',
9595
'ignore:Widget.widgets is deprecated:DeprecationWarning',
96+
'ignore:`load_nexus` is deprecated:UserWarning',
9697
]

requirements/base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ numpy >= 1.20
33
plopp >= 22.12.1
44
pooch
55
scipp[interactive] >= 23.01.1
6-
scippnexus >= 23.01.1
6+
scippnexus >= 23.08.0
77
scipy >= 1.7.0

requirements/base.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SHA1:e2b6291badc023624caadbf35c04dddc28ce5b80
1+
# SHA1:3d5d4976ff9fc888b57efa667e95419bf19183df
22
#
33
# This file is autogenerated by pip-compile-multi
44
# To update, run:
@@ -66,7 +66,7 @@ graphlib-backport==1.0.3
6666
# via scipp
6767
h5py==3.9.0
6868
# via
69-
# -r requirements/base.in
69+
# -r base.in
7070
# scippnexus
7171
idna==3.4
7272
# via
@@ -233,7 +233,7 @@ notebook-shim==0.2.3
233233
# nbclassic
234234
numpy==1.24.4
235235
# via
236-
# -r requirements/base.in
236+
# -r base.in
237237
# contourpy
238238
# h5py
239239
# ipydatawidgets
@@ -275,10 +275,10 @@ platformdirs==3.8.1
275275
# pooch
276276
plopp==23.5.1
277277
# via
278-
# -r requirements/base.in
278+
# -r base.in
279279
# scipp
280280
pooch==1.7.0
281-
# via -r requirements/base.in
281+
# via -r base.in
282282
prometheus-client==0.17.1
283283
# via
284284
# jupyter-server
@@ -304,7 +304,6 @@ pyparsing==3.0.9
304304
# via matplotlib
305305
python-dateutil==2.8.2
306306
# via
307-
# arrow
308307
# jupyter-client
309308
# matplotlib
310309
# scippnexus
@@ -348,13 +347,13 @@ rpds-py==0.8.10
348347
# referencing
349348
scipp[interactive]==23.7.0
350349
# via
351-
# -r requirements/base.in
350+
# -r base.in
352351
# scippnexus
353-
scippnexus==23.7.0
354-
# via -r requirements/base.in
352+
scippnexus==23.8.0
353+
# via -r base.in
355354
scipy==1.10.1
356355
# via
357-
# -r requirements/base.in
356+
# -r base.in
358357
# scippnexus
359358
send2trash==1.8.2
360359
# via

requirements/ci.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ idna==3.4
2525
# via requests
2626
packaging==23.1
2727
# via
28-
# -r requirements/ci.in
28+
# -r ci.in
2929
# pyproject-api
3030
# tox
3131
platformdirs==3.8.1
@@ -37,13 +37,13 @@ pluggy==1.2.0
3737
pyproject-api==1.5.3
3838
# via tox
3939
requests==2.31.0
40-
# via -r requirements/ci.in
40+
# via -r ci.in
4141
tomli==2.0.1
4242
# via
4343
# pyproject-api
4444
# tox
4545
tox==4.6.4
46-
# via -r requirements/ci.in
46+
# via -r ci.in
4747
urllib3==2.0.3
4848
# via requests
4949
virtualenv==20.23.1

requirements/dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ click==8.1.4
1515
# pip-compile-multi
1616
# pip-tools
1717
pip-compile-multi==2.6.3
18-
# via -r requirements/dev.in
18+
# via -r dev.in
1919
pip-tools==6.14.0
2020
# via pip-compile-multi
2121
toposort==1.10
2222
# via pip-compile-multi
2323
types-docutils==0.20.0.1
24-
# via -r requirements/dev.in
24+
# via -r dev.in
2525
types-requests==2.31.0.1
26-
# via -r requirements/dev.in
26+
# via -r dev.in
2727
types-urllib3==1.26.25.13
2828
# via types-requests
2929
wheel==0.40.0

0 commit comments

Comments
 (0)