Skip to content

Commit

Permalink
COMP: Update python packages to latest (partial backport)
Browse files Browse the repository at this point in the history
Partial cherry-pick from f7095e8 (originally integrated into main through #6803)
excluding changes to `SuperBuild/External_python-numpy.py`.

Since the update from numpy 1.23 to 1.24 removes deprecations (see [1]), the
minor version update is not backported to the 5.2 maintenance branch.

[1]: https://numpy.org/devdocs/release/1.24.0-notes.html
  • Loading branch information
jamesobutler authored and jcfr committed Feb 21, 2023
1 parent ae894ab commit b4090ea
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 32 deletions.
44 changes: 25 additions & 19 deletions SuperBuild/External_python-dicom-requirements.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,35 +41,41 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [pydicom]
pydicom==2.3.0 --hash=sha256:8ff31e077cc51d19ac3b8ca988ac486099cdebfaf885989079fdc7c75068cdd8
pydicom==2.3.1 --hash=sha256:b00bacdabc1f8a18b61a08bb6cd0f41c419446531638c895a708c22a35d69cfe
# [/pydicom]
# [six]
six==1.16.0 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
# [/six]
# [Pillow]
# Hashes correspond to the following packages:
# - Pillow-9.2.0-cp39-cp39-macosx_10_10_x86_64.whl
# - Pillow-9.2.0-cp39-cp39-macosx_11_0_arm64.whl
# - Pillow-9.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
# - Pillow-9.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
# - Pillow-9.2.0-cp39-cp39-manylinux_2_28_aarch64.whl
# - Pillow-9.2.0-cp39-cp39-manylinux_2_28_x86_64.whl
# - Pillow-9.2.0-cp39-cp39-musllinux_1_1_x86_64.whl
# - Pillow-9.2.0-cp39-cp39-win_amd64.whl
Pillow==9.2.0 --hash=sha256:0ed2c4ef2451de908c90436d6e8092e13a43992f1860275b4d8082667fbb2ffc \
--hash=sha256:4ad2f835e0ad81d1689f1b7e3fbac7b01bb8777d5a985c8962bedee0cc6d43da \
--hash=sha256:ea98f633d45f7e815db648fd7ff0f19e328302ac36427343e4432c84432e7ff4 \
--hash=sha256:9a54614049a18a2d6fe156e68e188da02a046a4a93cf24f373bffd977e943421 \
--hash=sha256:5aed7dde98403cd91d86a1115c78d8145c83078e864c1de1064f52e6feb61b20 \
--hash=sha256:13b725463f32df1bfeacbf3dd197fb358ae8ebcd8c5548faa75126ea425ccb60 \
--hash=sha256:808add66ea764ed97d44dda1ac4f2cfec4c1867d9efb16a33d158be79f32b8a4 \
--hash=sha256:fac2d65901fb0fdf20363fbd345c01958a742f2dc62a8dd4495af66e3ff502a4
# - Pillow-9.4.0-1-cp39-cp39-macosx_10_10_x86_64.whl
# - Pillow-9.4.0-2-cp39-cp39-macosx_10_10_x86_64.whl
# - Pillow-9.4.0-cp39-cp39-macosx_10_10_x86_64.whl
# - Pillow-9.4.0-cp39-cp39-macosx_11_0_arm64.whl
# - Pillow-9.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
# - Pillow-9.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
# - Pillow-9.4.0-cp39-cp39-manylinux_2_28_aarch64.whl
# - Pillow-9.4.0-cp39-cp39-manylinux_2_28_x86_64.whl
# - Pillow-9.4.0-cp39-cp39-musllinux_1_1_aarch64.whl
# - Pillow-9.4.0-cp39-cp39-musllinux_1_1_x86_64.whl
# - Pillow-9.4.0-cp39-cp39-win_amd64.whl
Pillow==9.4.0 --hash=sha256:b8c2f6eb0df979ee99433d8b3f6d193d9590f735cf12274c108bd954e30ca858 \
--hash=sha256:9e5f94742033898bfe84c93c831a6f552bb629448d4072dd312306bab3bd96f1 \
--hash=sha256:0f3269304c1a7ce82f1759c12ce731ef9b6e95b6df829dccd9fe42912cc48569 \
--hash=sha256:cb362e3b0976dc994857391b776ddaa8c13c28a16f80ac6522c23d5257156bed \
--hash=sha256:a2e0f87144fcbbe54297cae708c5e7f9da21a4646523456b00cc956bd4c65815 \
--hash=sha256:0884ba7b515163a1a05440a138adeb722b8a6ae2c2b33aea93ea3118dd3a899e \
--hash=sha256:53dcb50fbdc3fb2c55431a9b30caeb2f7027fcd2aeb501459464f0214200a503 \
--hash=sha256:e8c5cf126889a4de385c02a2c3d3aba4b00f70234bfddae82a5eaa3ee6d5e3e6 \
--hash=sha256:6c6b1389ed66cdd174d040105123a5a1bc91d0aa7059c7261d20e583b6d8cbd2 \
--hash=sha256:0dd4c681b82214b36273c18ca7ee87065a50e013112eea7d78c7a1b89a739153 \
--hash=sha256:54614444887e0d3043557d9dbc697dbb16cfb5a35d672b7a0fcc1ed0cf1c600b
# [/Pillow]
# [retrying]
retrying==1.3.3 --hash=sha256:08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b
retrying==1.3.4 --hash=sha256:8cc4d43cb8e1125e0ff3344e9de678fefd85db3b750b81b2240dc0183af37b35
# [/retrying]
# [dicomweb-client]
dicomweb-client==0.57.1 --hash=sha256:191f39a06ac5b256ec0c160e6a9c54c9af0d8256eea1d5cb39781939381e3969
dicomweb-client==0.59.0 --hash=sha256:70a3cdae97f2ce8288e5b61baa75aa68b39da7b2712da9e248eb7b6f7f269651
# [/dicomweb-client]
]===])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [chardet]
chardet==5.0.0 --hash=sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557
chardet==5.1.0 --hash=sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9
# [/chardet]
# [CouchDB]
couchdb==1.2 --hash=sha256:13a28a1159c49f8346732e8724b9a4d65cba54bec017c4a7eeb1499fe88151d1
# [/CouchDB]
# [gitdb]
gitdb==4.0.9 --hash=sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd
gitdb==4.0.10 --hash=sha256:c286cf298426064079ed96a9e4a9d39e7f3e9bf15ba60701e95f5492f28415c7
# [/gitdb]
# [smmap]
smmap==5.0.0 --hash=sha256:2aba19d6a040e78d8b09de5c57e96207b09ed71d8e55ce0959eeee6c8e190d94
# [/smmap]
# [GitPython]
GitPython==3.1.29 --hash=sha256:41eea0deec2deea139b459ac03656f0dd28fc4a3387240ec1d3c259a2c47850f
GitPython==3.1.30 --hash=sha256:cd455b0000615c60e286208ba540271af9fe531fa6a87cc590a7298785ab2882
# [/GitPython]
# [six]
six==1.16.0 --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [PyJWT]
PyJWT==2.5.0 --hash=sha256:8d82e7087868e94dd8d7d418e5088ce64f7daab4b36db654cbaedb46f9d1ca80
PyJWT==2.6.0 --hash=sha256:d83c3d892a77bbb74d3e1a2cfa90afaadb60945205d1095d9221f04466f64c14
# [/PyJWT]
# [wrapt]
# Hashes correspond to the following packages:
Expand Down Expand Up @@ -93,7 +93,7 @@ if(NOT Slicer_USE_SYSTEM_${proj})
--hash=sha256:20f42270d27e1b6a29f54032090b972d97f0a1b0948cc52392041ef7831fee93
# [/PyNaCl]
# [PyGithub]
PyGithub==1.56 --hash=sha256:d15f13d82165306da8a68aefc0f848a6f6432d5febbff13b60a94758ce3ef8b5
PyGithub==1.57 --hash=sha256:5822febeac2391f1306c55a99af2bc8f86c8bf82ded000030cd02c18f31b731f
# [/PyGithub]
]===])

Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_python-pip.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [pip]
pip==22.3 --hash=sha256:1daab4b8d3b97d1d763caeb01a4640a2250a0ea899e257b1e44b9eded91e15ab
pip==23.0 --hash=sha256:b5f88adff801f5ef052bcdef3daa31b55eb67b0fccd6d0106c206fa248e0463c
# [/pip]
]===])

Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_python-pythonqt-requirements.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [packaging]
packaging==21.3 --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
packaging==23.0 --hash=sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2
# [/packaging]
# [pyparsing]
pyparsing==3.0.9 --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc
Expand Down
26 changes: 22 additions & 4 deletions SuperBuild/External_python-requests-requirements.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,37 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [certifi]
certifi==2022.9.24 --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
certifi==2022.12.7 --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18
# [/certifi]
# [idna]
idna==3.4 --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
# [/idna]
# [charset-normalizer]
charset-normalizer==2.1.1 --hash=sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f
# Hashes correspond to the following packages:
# - charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl
# - charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl
# - charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl
# - charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
# - charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
# - charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl
# - charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl
# - charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl
# - charset_normalizer-3.0.1-py3-none-any.whl
charset-normalizer==3.0.1 --hash=sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f \
--hash=sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678 \
--hash=sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be \
--hash=sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b \
--hash=sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3 \
--hash=sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d \
--hash=sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786 \
--hash=sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59 \
--hash=sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24
# [/charset-normalizer]
# [urllib3]
urllib3==1.26.12 --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997
urllib3==1.26.14 --hash=sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1
# [/urllib3]
# [requests]
requests==2.28.1 --hash=sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349
requests==2.28.2 --hash=sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa
# [/requests]
]===])

Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_python-setuptools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [setuptools]
setuptools==65.5.0 --hash=sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356
setuptools==67.0.0 --hash=sha256:9d790961ba6219e9ff7d9557622d2fe136816a264dd01d5997cfc057d804853d
# [/setuptools]
]===])

Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/External_python-wheel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if(NOT Slicer_USE_SYSTEM_${proj})
set(requirements_file ${CMAKE_BINARY_DIR}/${proj}-requirements.txt)
file(WRITE ${requirements_file} [===[
# [wheel]
wheel==0.37.1 --hash=sha256:4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a
wheel==0.38.4 --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8
# [/wheel]
]===])

Expand Down

0 comments on commit b4090ea

Please sign in to comment.