diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2021-10-21 14:41:59 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2021-10-21 14:46:28 +0300 |
commit | 417ce7ffc1bbb9da15e82b6b81537bc86831f21c (patch) | |
tree | 24a787c4fdd76cd13afa1d038af55e5860c50e20 /build_files/build_environment/cmake | |
parent | f81f56751aafa3ea5881a139ab178741833cc562 (diff) |
Deps: Python, bump bundled packages to their latest versions
certifi : 2020.12.5 → 2021.10.8
chardet : 4.0.0 → charset-normalizer 2.0.6
cython : 0.29.21 → 0.29.24
idna : 2.10 → 3.2
numpy : 1.19.5 → 1.21.2 (which makes it possible to remove our patch)
requests: 2.25.1 → 2.26.0
urllib3 : 1.26.3 → 1.26.7
Nowadays `requests` no longer depends on `chardet` but on
`charset-normalizer`. That project describes itself as:
> A library that helps you read text from an unknown charset encoding.
> Motivated by chardet, I'm trying to resolve the issue by taking a new
> approach. All IANA character set names for which the Python core library
> provides codecs are supported.
Reviewed By: LazyDodo, mont29, brecht
Differential Revision: https://developer.blender.org/D12777
Diffstat (limited to 'build_files/build_environment/cmake')
-rw-r--r-- | build_files/build_environment/cmake/numpy.cmake | 1 | ||||
-rw-r--r-- | build_files/build_environment/cmake/python_site_packages.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 20 |
3 files changed, 11 insertions, 12 deletions
diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake index 73fa6e75556..1b58fd6aee9 100644 --- a/build_files/build_environment/cmake/numpy.cmake +++ b/build_files/build_environment/cmake/numpy.cmake @@ -38,7 +38,6 @@ ExternalProject_Add(external_numpy PREFIX ${BUILD_DIR}/numpy PATCH_COMMAND ${NUMPY_PATCH} CONFIGURE_COMMAND "" - PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff LOG_BUILD 1 BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable INSTALL_COMMAND "" diff --git a/build_files/build_environment/cmake/python_site_packages.cmake b/build_files/build_environment/cmake/python_site_packages.cmake index 2b75a6a244f..6bc47fa5c45 100644 --- a/build_files/build_environment/cmake/python_site_packages.cmake +++ b/build_files/build_environment/cmake/python_site_packages.cmake @@ -25,7 +25,7 @@ ExternalProject_Add(external_python_site_packages CONFIGURE_COMMAND "" BUILD_COMMAND "" PREFIX ${BUILD_DIR}/site_packages - INSTALL_COMMAND ${PYTHON_BINARY} -m pip install ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: + INSTALL_COMMAND ${PYTHON_BINARY} -m pip install ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: ) if(USE_PIP_NUMPY) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index d8faaf3c6f6..ec83de4866f 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -215,17 +215,17 @@ set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807) set(NANOVDB_HASH_TYPE MD5) set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz) -set(IDNA_VERSION 2.10) -set(CHARDET_VERSION 4.0.0) -set(URLLIB3_VERSION 1.26.3) -set(CERTIFI_VERSION 2020.12.5) -set(REQUESTS_VERSION 2.25.1) -set(CYTHON_VERSION 0.29.21) - -set(NUMPY_VERSION 1.19.5) -set(NUMPY_SHORT_VERSION 1.19) +set(IDNA_VERSION 3.2) +set(CHARSET_NORMALIZER_VERSION 2.0.6) +set(URLLIB3_VERSION 1.26.7) +set(CERTIFI_VERSION 2021.10.8) +set(REQUESTS_VERSION 2.26.0) +set(CYTHON_VERSION 0.29.24) + +set(NUMPY_VERSION 1.21.2) +set(NUMPY_SHORT_VERSION 1.21) set(NUMPY_URI https://github.com/numpy/numpy/releases/download/v${NUMPY_VERSION}/numpy-${NUMPY_VERSION}.zip) -set(NUMPY_HASH f6a1b48717c552bbc18f1adc3cc1fe0e) +set(NUMPY_HASH 5638d5dae3ca387be562912312db842e) set(NUMPY_HASH_TYPE MD5) set(NUMPY_FILE numpy-${NUMPY_VERSION}.zip) |