diff options
author | Ray Molenkamp <github@lazydodo.com> | 2022-04-28 18:37:22 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2022-04-28 18:37:22 +0300 |
commit | 16b6d4aeb300132cd3ab1d0e48acc8ef5e199a95 (patch) | |
tree | 5939141fcc377663f99fff17305a92dc257265ab /build_files/build_environment | |
parent | 44b318bd226948b71b4e2f65030f4b3440954f02 (diff) |
Deps:Specify versions for implicit python modules
D14686 added autopep8 which implicitly dragged in
toml and pycodestyle which were not versioned, this
diff adds explicit versions of these deps so there
won't be any version changes if we rebuild in the
future.
Reviewed By: brecht, sybren
Differential Revision: https://developer.blender.org/D14793
Diffstat (limited to 'build_files/build_environment')
-rw-r--r-- | build_files/build_environment/cmake/python_site_packages.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build_files/build_environment/cmake/python_site_packages.cmake b/build_files/build_environment/cmake/python_site_packages.cmake index da114207a61..55d0d6c7400 100644 --- a/build_files/build_environment/cmake/python_site_packages.cmake +++ b/build_files/build_environment/cmake/python_site_packages.cmake @@ -15,7 +15,7 @@ ExternalProject_Add(external_python_site_packages CONFIGURE_COMMAND ${PIP_CONFIGURE_COMMAND} BUILD_COMMAND "" PREFIX ${BUILD_DIR}/site_packages - INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} --no-binary :all: + INSTALL_COMMAND ${PYTHON_BINARY} -m pip install --no-cache-dir ${SITE_PACKAGES_EXTRA} cython==${CYTHON_VERSION} idna==${IDNA_VERSION} charset-normalizer==${CHARSET_NORMALIZER_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} toml==${TOML_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 be46f268ee5..25267273db0 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -226,6 +226,8 @@ set(CYTHON_VERSION 0.29.26) # At this time of writing, 0.17.0 was already released, but built against zstd 1.5.1, while we use 1.5.0. set(ZSTANDARD_VERSION 0.16.0) set(AUTOPEP8_VERSION 1.6.0) +set(PYCODESTYLE_VERSION 2.8.0) +set(TOML_VERSION 0.10.2) set(NUMPY_VERSION 1.22.0) set(NUMPY_SHORT_VERSION 1.22) |