Skip to content

Commit 1bfa19c

Browse files
authored
Merge pull request #140 from scipp/update-deps
Update to scipp 0.16.3 and scippneutron 0.9.3
2 parents c16aa33 + fe17e80 commit 1bfa19c

File tree

3 files changed

+70
-50
lines changed

3 files changed

+70
-50
lines changed

.buildconfig/ci.yml

Lines changed: 68 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies:
1616
- _libgcc_mutex=0.1
1717
- _openmp_mutex=4.5
1818
- alabaster=0.7.12
19+
- alsa-lib=1.2.7.2
1920
- appdirs=1.4.4
2021
- asttokens=2.0.8
2122
- atk-1.0=2.36.0
@@ -33,28 +34,30 @@ dependencies:
3334
- brotlipy=0.7.0
3435
- bzip2=1.0.8
3536
- c-ares=1.18.1
36-
- ca-certificates=2022.6.15
37+
- ca-certificates=2022.9.24
3738
- cached-property=1.5.2
3839
- cached_property=1.5.2
3940
- cairo=1.16.0
40-
- certifi=2022.6.15
41+
- certifi=2022.9.24
4142
- cffi=1.15.1
4243
- charset-normalizer=2.1.1
4344
- colorama=0.4.5
4445
- confuse=2.0.0
46+
- contourpy=1.0.5
4547
- cryptography=36.0.2
4648
- curl=7.82.0
4749
- cycler=0.11.0
4850
- cyrus-sasl=2.1.27
51+
- dbus=1.13.6
4952
- debugpy=1.6.3
5053
- decorator=5.1.1
5154
- defusedxml=0.7.1
5255
- docutils=0.16
5356
- double-conversion=3.1.7
5457
- eigen=3.4.0
5558
- entrypoints=0.4
56-
- executing=1.0.0
57-
- expat=2.4.8
59+
- executing=1.1.0
60+
- expat=2.4.9
5861
- ffmpeg=4.3.2
5962
- flake8=5.0.4
6063
- font-ttf-dejavu-sans-mono=2.37
@@ -64,7 +67,7 @@ dependencies:
6467
- fontconfig=2.14.0
6568
- fonts-conda-ecosystem=1
6669
- fonts-conda-forge=1
67-
- fonttools=4.37.1
70+
- fonttools=4.37.3
6871
- freeimage=3.18.0
6972
- freetype=2.12.1
7073
- fribidi=1.0.10
@@ -73,40 +76,44 @@ dependencies:
7376
- giflib=5.2.1
7477
- gl2ps=1.4.2
7578
- glew=2.1.0
79+
- glib=2.74.0
80+
- glib-tools=2.74.0
7681
- gmp=6.2.1
7782
- gnutls=3.6.13
7883
- graphite2=1.3.13
7984
- graphlib-backport=1.0.3
80-
- graphviz=5.0.1
85+
- graphviz=3.0.0
8186
- gsl=2.6
87+
- gst-plugins-base=1.20.3
88+
- gstreamer=1.20.3
8289
- gtk2=2.24.33
8390
- gts=0.7.6
8491
- h5py=3.1.0
85-
- harfbuzz=5.1.0
92+
- harfbuzz=4.2.0
8693
- hdf4=4.2.15
8794
- hdf5=1.10.6
88-
- icu=70.1
89-
- idna=3.3
95+
- icu=69.1
96+
- idna=3.4
9097
- imagesize=1.4.1
9198
- imath=3.1.5
9299
- importlib-metadata=4.11.4
93100
- importlib_resources=5.9.0
94101
- iniconfig=1.1.1
95102
- ipydatawidgets=4.3.2
96-
- ipykernel=6.15.1
103+
- ipykernel=6.16.0
97104
- ipympl=0.9.2
98-
- ipython=8.4.0
105+
- ipython=8.5.0
99106
- ipython_genutils=0.2.0
100-
- ipywidgets=8.0.1
107+
- ipywidgets=8.0.2
101108
- jedi=0.18.1
102109
- jinja2=3.1.2
103110
- jpeg=9e
104111
- jsoncpp=1.9.4
105-
- jsonschema=4.14.0
112+
- jsonschema=4.16.0
106113
- jupyter_client=7.3.5
107114
- jupyter_core=4.11.1
108115
- jupyterlab_pygments=0.2.2
109-
- jupyterlab_widgets=3.0.2
116+
- jupyterlab_widgets=3.0.3
110117
- jxrlib=1.1
111118
- keyutils=1.6.1
112119
- kiwisolver=1.4.4
@@ -120,36 +127,41 @@ dependencies:
120127
- libbrotlidec=1.0.9
121128
- libbrotlienc=1.0.9
122129
- libcblas=3.9.0
130+
- libclang=13.0.1
123131
- libcurl=7.82.0
124-
- libdeflate=1.13
132+
- libdeflate=1.14
125133
- libedit=3.1.20191231
126134
- libev=4.33
135+
- libevent=2.1.10
127136
- libffi=3.4.2
128137
- libgcc-ng=12.1.0
129138
- libgcrypt=1.10.1
130139
- libgd=2.3.3
131140
- libgfortran-ng=12.1.0
132141
- libgfortran5=12.1.0
133-
- libglib=2.72.1
142+
- libglib=2.74.0
134143
- libglu=9.0.0
135144
- libgomp=12.1.0
136145
- libgpg-error=1.45
137146
- libgsasl=1.10.0
138-
- libiconv=1.16
147+
- libiconv=1.17
139148
- libjemalloc=5.2.1
140149
- liblapack=3.9.0
141-
- libnetcdf=4.8.0
150+
- libllvm13=13.0.1
151+
- libnetcdf=4.8.1
142152
- libnghttp2=1.47.0
143153
- libnsl=2.0.0
144154
- libntlm=1.4
145155
- libogg=1.3.4
146156
- libopenblas=0.3.21
147-
- libpng=1.6.37
157+
- libopus=1.3.1
158+
- libpng=1.6.38
159+
- libpq=14.2
148160
- libraw=0.20.2
149161
- librdkafka=1.8.2.post2
150-
- librsvg=2.54.4
162+
- librsvg=2.52.5
151163
- libsodium=1.0.18
152-
- libsqlite=3.39.2
164+
- libsqlite=3.39.3
153165
- libssh2=1.10.0
154166
- libstdcxx-ng=12.1.0
155167
- libtheora=1.1.1
@@ -160,31 +172,36 @@ dependencies:
160172
- libwebp=1.2.4
161173
- libwebp-base=1.2.4
162174
- libxcb=1.13
163-
- libxml2=2.9.14
164-
- libxslt=1.1.35
175+
- libxkbcommon=1.0.3
176+
- libxml2=2.9.12
177+
- libxslt=1.1.33
165178
- libzip=1.8.0
166179
- libzlib=1.2.12
167180
- loguru=0.6.0
168-
- lxml=4.9.1
181+
- lxml=4.8.0
169182
- lz4-c=1.9.3
170183
- mantid=6.4.0
171184
- markupsafe=2.1.1
172-
- matplotlib-base=3.5.3
185+
- matplotlib-base=3.6.0
173186
- matplotlib-inline=0.1.6
174187
- mccabe=0.7.0
175188
- mistune=2.0.4
176189
- munkres=1.1.4
177190
- muparser=2.3.2
178-
- nbclient=0.6.7
191+
- mysql-common=8.0.28
192+
- mysql-libs=8.0.28
193+
- nbclient=0.6.8
179194
- nbconvert=7.0.0
180195
- nbconvert-core=7.0.0
181196
- nbconvert-pandoc=7.0.0
182-
- nbformat=5.4.0
197+
- nbformat=5.6.1
183198
- nbsphinx=0.8.9
184199
- ncurses=6.3
185200
- nest-asyncio=1.5.5
186201
- nettle=3.6
187202
- nexus=4.4.3
203+
- nspr=4.32
204+
- nss=3.78
188205
- numpy=1.20.3
189206
- occt=7.5.3
190207
- openexr=3.1.5
@@ -194,9 +211,9 @@ dependencies:
194211
- packaging=21.3
195212
- pandoc=2.19.2
196213
- pandocfilters=1.5.0
197-
- pango=1.50.9
214+
- pango=1.50.7
198215
- parso=0.8.3
199-
- pcre=8.45
216+
- pcre2=10.37
200217
- pexpect=4.8.0
201218
- pickleshare=0.7.5
202219
- pillow=9.2.0
@@ -206,9 +223,9 @@ dependencies:
206223
- pluggy=1.0.0
207224
- poco=1.11.1
208225
- pooch=1.6.0
209-
- proj=7.2.0
210-
- prompt-toolkit=3.0.30
211-
- psutil=5.9.1
226+
- proj=8.2.0
227+
- prompt-toolkit=3.0.31
228+
- psutil=5.9.2
212229
- pthread-stubs=0.4
213230
- ptyprocess=0.7.0
214231
- pugixml=1.11.4
@@ -223,24 +240,25 @@ dependencies:
223240
- pyparsing=3.0.9
224241
- pyrsistent=0.18.1
225242
- pysocks=1.7.1
226-
- pytest=7.1.2
243+
- pytest=7.1.3
227244
- python=3.8.12
228245
- python-dateutil=2.8.2
229-
- python-fastjsonschema=2.16.1
246+
- python-fastjsonschema=2.16.2
230247
- python-graphviz=0.20.1
231248
- python_abi=3.8
232-
- pythreejs=2.4.0
249+
- pythreejs=2.4.1
233250
- pytz=2022.2.1
234251
- pyyaml=6.0
235-
- pyzmq=23.2.1
252+
- pyzmq=24.0.1
253+
- qt=5.12.9
236254
- rapidjson=1.1.0
237255
- readline=8.1.2
238256
- requests=2.28.1
239-
- scipp=0.16.2
240-
- scippneutron=0.9.2
241-
- scippnexus=0.1.8
242-
- scipy=1.9.0
243-
- setuptools=65.3.0
257+
- scipp=0.16.4
258+
- scippneutron=0.9.4
259+
- scippnexus=0.3.2
260+
- scipy=1.9.1
261+
- setuptools=65.4.0
244262
- six=1.16.0
245263
- snowballstemmer=2.2.0
246264
- soupsieve=2.3.2.post1
@@ -252,25 +270,26 @@ dependencies:
252270
- sphinxcontrib-jsmath=1.0.1
253271
- sphinxcontrib-qthelp=1.0.3
254272
- sphinxcontrib-serializinghtml=1.1.5
255-
- sqlite=3.39.2
256-
- stack_data=0.5.0
273+
- sqlite=3.39.3
274+
- stack_data=0.5.1
257275
- tbb=2020.2
258276
- tbb-devel=2020.2
259277
- tinycss2=1.1.1
260278
- tk=8.6.12
261279
- tomli=2.0.1
262280
- tornado=6.2
263-
- traitlets=5.3.0
281+
- traitlets=5.4.0
264282
- traittypes=0.2.1
283+
- typing_extensions=4.3.0
265284
- unicodedata2=14.0.0
266285
- unixodbc=2.3.10
267286
- urllib3=1.26.11
268287
- utfcpp=3.2.1
269-
- vtk=9.0.1
288+
- vtk=9.1.0
270289
- wcwidth=0.2.5
271290
- webencodings=0.5.1
272291
- wheel=0.37.1
273-
- widgetsnbextension=4.0.2
292+
- widgetsnbextension=4.0.3
274293
- x264=1!161.3030
275294
- xorg-kbproto=1.0.7
276295
- xorg-libice=1.0.10
@@ -292,7 +311,7 @@ dependencies:
292311
- zlib=1.2.12
293312
- zstd=1.5.2
294313
- pip:
295-
- nb-clean==2.2.0
314+
- nb-clean==2.3.0
296315
- orsopy==1.0.1
297-
- sphinx==5.1.1
298-
- sphinx-autodoc-typehints==1.19.2
316+
- sphinx==5.2.2
317+
- sphinx-autodoc-typehints==1.19.4

conda/meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ requirements:
1515
- ipywidgets
1616
- matplotlib
1717
- pooch
18+
- scipp>=0.16.4
1819
- scippneutron>=0.9
1920

2021
test:

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- pytest
2121
- pythreejs
2222
- python-graphviz
23-
- scippneutron>=0.9
23+
- scippneutron>=0.9.4
2424
- sphinx
2525
- sphinx-book-theme=0.2 # custom buttons in top bar do not work with version 0.3
2626
- sphinx-copybutton

0 commit comments

Comments
 (0)