From f8a29ccab5b3f2f6a1a7910e7db8b128aa979c94 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 14 Oct 2024 21:50:01 +1100 Subject: [PATCH] Update autopep8 1.6.0 -> 2.3.1, remove outdated "toml" module Bump autopep8 as there has been various improvements & bug-fixes. Also update pycodestyle 2.8 -> 2.12.1. autopep8 imported a module "toml" which has been superseded by Python's own "tomllib". The "toml" module has been removed. Ref !127553 --- .../build_environment/cmake/python_site_packages.cmake | 1 - build_files/build_environment/cmake/versions.cmake | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build_files/build_environment/cmake/python_site_packages.cmake b/build_files/build_environment/cmake/python_site_packages.cmake index 111823f99bf..4329cb4e3f7 100644 --- a/build_files/build_environment/cmake/python_site_packages.cmake +++ b/build_files/build_environment/cmake/python_site_packages.cmake @@ -35,7 +35,6 @@ ExternalProject_Add(external_python_site_packages zstandard==${ZSTANDARD_VERSION} autopep8==${AUTOPEP8_VERSION} pycodestyle==${PYCODESTYLE_VERSION} - toml==${TOML_VERSION} meson==${MESON_VERSION} --no-binary :all: ) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 272e31446d0..a0fd9ec79a8 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -287,11 +287,9 @@ set(CYTHON_VERSION 0.29.30) # but built against ZSTD 1.5.1, while we use 1.5.0. set(ZSTANDARD_VERSION 0.16.0) # Auto-format Python source (developer tool, not used by Blender at run-time). -set(AUTOPEP8_VERSION 1.6.0) +set(AUTOPEP8_VERSION 2.3.1) # Needed by: `autopep8` (so the version doesn't change on rebuild). -set(PYCODESTYLE_VERSION 2.8.0) -# Needed by: `autopep8` (so the version doesn't change on rebuild). -set(TOML_VERSION 0.10.2) +set(PYCODESTYLE_VERSION 2.12.1) # Build system for other packages (not used by Blender at run-time). set(MESON_VERSION 0.63.0)