Skip to content
This repository was archived by the owner on Mar 21, 2024. It is now read-only.

Commit 02e7d9a

Browse files
peterhesseypeterhessey
authored
ENH: Upgrade DICOM-RT Version to 1.1.0 (#807)
Upgrading DICOM-RT to incorporate fixes to various DICOM issues.
1 parent 78b7de2 commit 02e7d9a

3 files changed

Lines changed: 51 additions & 53 deletions

File tree

‎TestSubmodule/environment.yml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- blosc=1.21.0=h4ff587b_1
1212
- bzip2=1.0.8=h7b6447c_0
1313
- ca-certificates=2022.07.19=h06a4308_0
14-
- certifi=2022.9.14=py38h06a4308_0
14+
- certifi=2022.9.24=py38h06a4308_0
1515
- cudatoolkit=11.3.1=h2bc3f7f_2
1616
- ffmpeg=4.2.2=h20bf706_0
1717
- freetype=2.11.0=h70c0345_0
@@ -37,8 +37,8 @@ dependencies:
3737
- libunistring=0.9.10=h27cfd23_0
3838
- libuv=1.40.0=h7b6447c_0
3939
- libvpx=1.7.0=h439df22_0
40-
- libwebp=1.2.2=h55f646e_0
41-
- libwebp-base=1.2.2=h7f8727e_0
40+
- libwebp=1.2.4=h11a3e52_0
41+
- libwebp-base=1.2.4=h5eee18b_0
4242
- lz4-c=1.9.3=h295c915_1
4343
- mkl=2021.4.0=h06a4308_640
4444
- mkl-service=2.4.0=py38h7f8727e_0
@@ -55,13 +55,13 @@ dependencies:
5555
- pytorch-mutex=1.0=cuda
5656
- readline=8.1.2=h7f8727e_1
5757
- setuptools=63.4.1=py38h06a4308_0
58-
- sqlite=3.39.2=h5082296_0
58+
- sqlite=3.39.3=h5082296_0
5959
- tk=8.6.12=h1ccaba5_0
6060
- torchvision=0.11.1=py38_cu113
6161
- typing_extensions=4.3.0=py38h06a4308_0
6262
- wheel=0.37.1=pyhd3eb1b0_0
6363
- x264=1!157.20191217=h7b6447c_0
64-
- xz=5.2.5=h7f8727e_1
64+
- xz=5.2.6=h5eee18b_0
6565
- zlib=1.2.12=h5eee18b_3
6666
- zstd=1.5.2=ha4553b6_0
6767
- pip:
@@ -78,7 +78,7 @@ dependencies:
7878
- async-timeout==4.0.2
7979
- attrs==22.1.0
8080
- azure-common==1.1.28
81-
- azure-core==1.25.1
81+
- azure-core==1.26.0
8282
- azure-graphrbac==0.61.1
8383
- azure-identity==1.7.0
8484
- azure-mgmt-authorization==0.61.0
@@ -109,7 +109,7 @@ dependencies:
109109
- backports-tempfile==1.0
110110
- backports-weakref==1.0.post1
111111
- beautifulsoup4==4.11.1
112-
- black==22.8.0
112+
- black==22.10.0
113113
- bleach==5.0.1
114114
- cachetools==4.2.4
115115
- cffi==1.15.1
@@ -120,15 +120,15 @@ dependencies:
120120
- commonmark==0.9.1
121121
- conda-merge==0.1.5
122122
- contextlib2==21.6.0
123-
- coverage==6.4.4
123+
- coverage==6.5.0
124124
- cryptography==3.3.2
125125
- cycler==0.11.0
126126
- databricks-cli==0.17.3
127127
- dataclasses-json==0.5.2
128128
- debugpy==1.6.3
129129
- defusedxml==0.7.1
130130
- deprecated==1.2.13
131-
- distro==1.7.0
131+
- distro==1.8.0
132132
- docker==4.3.1
133133
- docutils==0.18.1
134134
- dotnetcore2==2.1.23
@@ -147,7 +147,7 @@ dependencies:
147147
- google-auth==1.35.0
148148
- google-auth-oauthlib==0.4.6
149149
- gputil==1.4.0
150-
- greenlet==1.1.3
150+
- greenlet==1.1.3.post0
151151
- grpcio==1.49.1
152152
- gunicorn==20.1.0
153153
- h5py==2.10.0
@@ -157,10 +157,10 @@ dependencies:
157157
- idna==3.4
158158
- imageio==2.15.0
159159
- imagesize==1.4.1
160-
- importlib-metadata==4.12.0
161-
- importlib-resources==5.9.0
160+
- importlib-metadata==5.0.0
161+
- importlib-resources==5.10.0
162162
- iniconfig==1.1.1
163-
- innereye-dicom-rt==1.0.3
163+
- innereye-dicom-rt==1.1.0
164164
- ipykernel==6.16.0
165165
- ipython==7.31.1
166166
- ipython-genutils==0.2.0
@@ -182,7 +182,6 @@ dependencies:
182182
- kiwisolver==1.4.4
183183
- lightning-bolts==0.4.0
184184
- llvmlite==0.34.0
185-
- lxml==4.9.1
186185
- mako==1.2.3
187186
- markdown==3.4.1
188187
- markdown-it-py==2.1.0
@@ -198,20 +197,20 @@ dependencies:
198197
- mlflow-skinny==1.29.0
199198
- monai==0.6.0
200199
- more-itertools==8.14.0
201-
- msal==1.19.0
200+
- msal==1.20.0
202201
- msal-extensions==0.3.1
203202
- msrest==0.7.1
204203
- msrestazure==0.6.4
205204
- multidict==6.0.2
206205
- mypy==0.910
207206
- mypy-extensions==0.4.3
208207
- myst-parser==0.18.0
209-
- nbclient==0.6.8
210-
- nbconvert==7.0.0
211-
- nbformat==5.6.1
208+
- nbclient==0.7.0
209+
- nbconvert==7.2.1
210+
- nbformat==5.7.0
212211
- ndg-httpsclient==0.5.1
213-
- nest-asyncio==1.5.5
214-
- networkx==2.8.6
212+
- nest-asyncio==1.5.6
213+
- networkx==2.8.7
215214
- nibabel==4.0.2
216215
- notebook==6.4.12
217216
- numba==0.51.2
@@ -256,12 +255,12 @@ dependencies:
256255
- pytest-xdist==1.34.0
257256
- python-dateutil==2.8.2
258257
- pytorch-lightning==1.6.5
259-
- pytz==2022.2.1
258+
- pytz==2022.4
260259
- pywavelets==1.4.1
261260
- pyyaml==6.0
262261
- pyzmq==24.0.1
263262
- qtconsole==5.3.2
264-
- qtpy==2.2.0
263+
- qtpy==2.2.1
265264
- querystring-parser==1.2.4
266265
- requests==2.28.1
267266
- requests-oauthlib==1.3.1
@@ -284,7 +283,7 @@ dependencies:
284283
- soupsieve==2.3.2.post1
285284
- sphinx==5.0.2
286285
- sphinx-argparse==0.3.1
287-
- sphinx-basic-ng==0.0.1a12
286+
- sphinx-basic-ng==1.0.0b1
288287
- sphinx-rtd-theme==1.0.0
289288
- sphinxcontrib-applehelp==1.0.2
290289
- sphinxcontrib-devhelp==1.0.2
@@ -301,10 +300,10 @@ dependencies:
301300
- tensorboard==2.3.0
302301
- tensorboard-plugin-wit==1.8.1
303302
- tensorboardx==2.1
304-
- terminado==0.15.0
303+
- terminado==0.16.0
305304
- textwrap3==0.9.2
306305
- threadpoolctl==3.1.0
307-
- tifffile==2022.8.12
306+
- tifffile==2022.10.10
308307
- tinycss2==1.1.1
309308
- toml==0.10.2
310309
- tomli==2.0.1
@@ -322,4 +321,4 @@ dependencies:
322321
- wrapt==1.14.1
323322
- yacs==0.1.8
324323
- yarl==1.8.1
325-
- zipp==3.8.1
324+
- zipp==3.9.0

‎environment.yml‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- blosc=1.21.0=h4ff587b_1
1212
- bzip2=1.0.8=h7b6447c_0
1313
- ca-certificates=2022.07.19=h06a4308_0
14-
- certifi=2022.9.14=py38h06a4308_0
14+
- certifi=2022.9.24=py38h06a4308_0
1515
- cudatoolkit=11.3.1=h2bc3f7f_2
1616
- ffmpeg=4.2.2=h20bf706_0
1717
- freetype=2.11.0=h70c0345_0
@@ -37,8 +37,8 @@ dependencies:
3737
- libunistring=0.9.10=h27cfd23_0
3838
- libuv=1.40.0=h7b6447c_0
3939
- libvpx=1.7.0=h439df22_0
40-
- libwebp=1.2.2=h55f646e_0
41-
- libwebp-base=1.2.2=h7f8727e_0
40+
- libwebp=1.2.4=h11a3e52_0
41+
- libwebp-base=1.2.4=h5eee18b_0
4242
- lz4-c=1.9.3=h295c915_1
4343
- mkl=2021.4.0=h06a4308_640
4444
- mkl-service=2.4.0=py38h7f8727e_0
@@ -55,13 +55,13 @@ dependencies:
5555
- pytorch-mutex=1.0=cuda
5656
- readline=8.1.2=h7f8727e_1
5757
- setuptools=63.4.1=py38h06a4308_0
58-
- sqlite=3.39.2=h5082296_0
58+
- sqlite=3.39.3=h5082296_0
5959
- tk=8.6.12=h1ccaba5_0
6060
- torchvision=0.11.1=py38_cu113
6161
- typing_extensions=4.3.0=py38h06a4308_0
6262
- wheel=0.37.1=pyhd3eb1b0_0
6363
- x264=1!157.20191217=h7b6447c_0
64-
- xz=5.2.5=h7f8727e_1
64+
- xz=5.2.6=h5eee18b_0
6565
- zlib=1.2.12=h5eee18b_3
6666
- zstd=1.5.2=ha4553b6_0
6767
- pip:
@@ -78,7 +78,7 @@ dependencies:
7878
- async-timeout==4.0.2
7979
- attrs==22.1.0
8080
- azure-common==1.1.28
81-
- azure-core==1.25.1
81+
- azure-core==1.26.0
8282
- azure-graphrbac==0.61.1
8383
- azure-identity==1.7.0
8484
- azure-mgmt-authorization==0.61.0
@@ -109,7 +109,7 @@ dependencies:
109109
- backports-tempfile==1.0
110110
- backports-weakref==1.0.post1
111111
- beautifulsoup4==4.11.1
112-
- black==22.8.0
112+
- black==22.10.0
113113
- bleach==5.0.1
114114
- cachetools==4.2.4
115115
- cffi==1.15.1
@@ -120,15 +120,15 @@ dependencies:
120120
- commonmark==0.9.1
121121
- conda-merge==0.1.5
122122
- contextlib2==21.6.0
123-
- coverage==6.4.4
123+
- coverage==6.5.0
124124
- cryptography==3.3.2
125125
- cycler==0.11.0
126126
- databricks-cli==0.17.3
127127
- dataclasses-json==0.5.2
128128
- debugpy==1.6.3
129129
- defusedxml==0.7.1
130130
- deprecated==1.2.13
131-
- distro==1.7.0
131+
- distro==1.8.0
132132
- docker==4.3.1
133133
- docutils==0.18.1
134134
- dotnetcore2==2.1.23
@@ -147,7 +147,7 @@ dependencies:
147147
- google-auth==1.35.0
148148
- google-auth-oauthlib==0.4.6
149149
- gputil==1.4.0
150-
- greenlet==1.1.3
150+
- greenlet==1.1.3.post0
151151
- grpcio==1.49.1
152152
- gunicorn==20.1.0
153153
- h5py==2.10.0
@@ -157,10 +157,10 @@ dependencies:
157157
- idna==3.4
158158
- imageio==2.15.0
159159
- imagesize==1.4.1
160-
- importlib-metadata==4.12.0
161-
- importlib-resources==5.9.0
160+
- importlib-metadata==5.0.0
161+
- importlib-resources==5.10.0
162162
- iniconfig==1.1.1
163-
- innereye-dicom-rt==1.0.3
163+
- innereye-dicom-rt==1.1.0
164164
- ipykernel==6.16.0
165165
- ipython==7.31.1
166166
- ipython-genutils==0.2.0
@@ -182,7 +182,6 @@ dependencies:
182182
- kiwisolver==1.4.4
183183
- lightning-bolts==0.4.0
184184
- llvmlite==0.34.0
185-
- lxml==4.9.1
186185
- mako==1.2.3
187186
- markdown==3.4.1
188187
- markdown-it-py==2.1.0
@@ -198,20 +197,20 @@ dependencies:
198197
- mlflow-skinny==1.29.0
199198
- monai==0.6.0
200199
- more-itertools==8.14.0
201-
- msal==1.19.0
200+
- msal==1.20.0
202201
- msal-extensions==0.3.1
203202
- msrest==0.7.1
204203
- msrestazure==0.6.4
205204
- multidict==6.0.2
206205
- mypy==0.910
207206
- mypy-extensions==0.4.3
208207
- myst-parser==0.18.0
209-
- nbclient==0.6.8
210-
- nbconvert==7.0.0
211-
- nbformat==5.6.1
208+
- nbclient==0.7.0
209+
- nbconvert==7.2.1
210+
- nbformat==5.7.0
212211
- ndg-httpsclient==0.5.1
213-
- nest-asyncio==1.5.5
214-
- networkx==2.8.6
212+
- nest-asyncio==1.5.6
213+
- networkx==2.8.7
215214
- nibabel==4.0.2
216215
- notebook==6.4.12
217216
- numba==0.51.2
@@ -256,12 +255,12 @@ dependencies:
256255
- pytest-xdist==1.34.0
257256
- python-dateutil==2.8.2
258257
- pytorch-lightning==1.6.5
259-
- pytz==2022.2.1
258+
- pytz==2022.4
260259
- pywavelets==1.4.1
261260
- pyyaml==6.0
262261
- pyzmq==24.0.1
263262
- qtconsole==5.3.2
264-
- qtpy==2.2.0
263+
- qtpy==2.2.1
265264
- querystring-parser==1.2.4
266265
- requests==2.28.1
267266
- requests-oauthlib==1.3.1
@@ -284,7 +283,7 @@ dependencies:
284283
- soupsieve==2.3.2.post1
285284
- sphinx==5.0.2
286285
- sphinx-argparse==0.3.1
287-
- sphinx-basic-ng==0.0.1a12
286+
- sphinx-basic-ng==1.0.0b1
288287
- sphinx-rtd-theme==1.0.0
289288
- sphinxcontrib-applehelp==1.0.2
290289
- sphinxcontrib-devhelp==1.0.2
@@ -301,10 +300,10 @@ dependencies:
301300
- tensorboard==2.3.0
302301
- tensorboard-plugin-wit==1.8.1
303302
- tensorboardx==2.1
304-
- terminado==0.15.0
303+
- terminado==0.16.0
305304
- textwrap3==0.9.2
306305
- threadpoolctl==3.1.0
307-
- tifffile==2022.8.12
306+
- tifffile==2022.10.10
308307
- tinycss2==1.1.1
309308
- toml==0.10.2
310309
- tomli==2.0.1
@@ -322,4 +321,4 @@ dependencies:
322321
- wrapt==1.14.1
323322
- yacs==0.1.8
324323
- yarl==1.8.1
325-
- zipp==3.8.1
324+
- zipp==3.9.0

‎primary_deps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131
- hi-ml==0.2.5
3232
- hi-ml-azure==0.2.5
3333
- imageio==2.15.0
34-
- InnerEye-DICOM-RT==1.0.3
34+
- InnerEye-DICOM-RT==1.1.0
3535
- ipython==7.31.1
3636
- joblib==0.16.0
3737
- jupyter-client==6.1.5

0 commit comments

Comments
 (0)