Build System - Black to 22.8.0. Per-Maya-version Python requirements.

Black was changed to v22.8.0, because this is the last version that supports Python 3.6.x. I've created per-Maya-version requirements files so we can control the individual versions that each Maya version is getting. Each Maya version may be on a different Python version.
david-cattermole · Sep 14, 2024 · 2a6f53f · 2a6f53f
1 parent 2d87324
commit 2a6f53f
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 13 deletions.
diff --git a/scripts/internal/python_venv_activate.bash b/scripts/internal/python_venv_activate.bash
@@ -70,13 +70,12 @@ source "${PYTHON_VIRTUAL_ENV_ACTIVATE_SCRIPT}"
 # Install requirements
 if [ ${REQUIRE_PACKAGE_INSTALL} -eq 1 ]; then
     ${PYTHON_EXE} -m pip install --upgrade pip
-    ${PYTHON_EXE} -m pip install -r "${PROJECT_ROOT}/share/requirements-dev.txt"
-    ${PYTHON_EXE} -m pip install -r "${PROJECT_ROOT}/share/requirements-doc.txt"
 
     REQUIRE_DEV_MAYA_VERSION_FILE="${PROJECT_ROOT}/share/requirements-dev-maya${MAYA_VERSION}.txt"
-    if [ -f "$REQUIRE_DEV_MAYA_VERSION_FILE" ]; then
-        ${PYTHON_EXE} -m pip install -r $REQUIRE_DEV_MAYA_VERSION_FILE
-    fi
+    REQUIRE_DOC_MAYA_VERSION_FILE="${PROJECT_ROOT}/share/requirements-doc-maya${MAYA_VERSION}.txt"
+
+    ${PYTHON_EXE} -m pip install -r $REQUIRE_DEV_MAYA_VERSION_FILE
+    ${PYTHON_EXE} -m pip install -r $REQUIRE_DOC_MAYA_VERSION_FILE
 fi
 
 cd ${PROJECT_ROOT}
diff --git a/scripts/internal/python_venv_activate.bat b/scripts/internal/python_venv_activate.bat
@@ -65,15 +65,12 @@ ECHO Activating Python Virtual Environment "%PYTHON_VIRTUAL_ENV_DIR_NAME%"
 CALL %PYTHON_VIRTUAL_ENV_ACTIVATE_SCRIPT%
 
 :: Install requirements
-SET MAYA_VERSION_REQUIRE_FILE=%PROJECT_ROOT%\share\requirements-dev-maya%MAYA_VERSION%.txt
+SET MAYA_VERSION_REQUIRE_DEV_FILE=%PROJECT_ROOT%\share\requirements-dev-maya%MAYA_VERSION%.txt
+SET MAYA_VERSION_REQUIRE_DOC_FILE=%PROJECT_ROOT%\share\requirements-doc-maya%MAYA_VERSION%.txt
 IF "%REQUIRE_PACKAGE_INSTALL%"=="1" (
     :: %PYTHON_EXE% -m pip install --upgrade pip
-    %PYTHON_EXE% -m pip install -r "%PROJECT_ROOT%\share\requirements-dev.txt"
-    %PYTHON_EXE% -m pip install -r "%PROJECT_ROOT%\share\requirements-doc.txt"
-
-    IF EXIST %MAYA_VERSION_REQUIRE_FILE% (
-        %PYTHON_EXE% -m pip install -r %MAYA_VERSION_REQUIRE_FILE%
-    )
+    %PYTHON_EXE% -m pip install -r %MAYA_VERSION_REQUIRE_DEV_FILE%
+    %PYTHON_EXE% -m pip install -r %MAYA_VERSION_REQUIRE_DEV_FILE%
 )
 
 :: Return back project root directory.

diff --git a/share/requirements-dev.txt → share/requirements-dev-maya2018.txt b/share/requirements-dev.txt → share/requirements-dev-maya2018.txt
@@ -1,4 +1,5 @@
-black==24.3.0
+# Expects Python 3.6.x
+black==22.8.0
 pylint==2.13.9
 flake8==4.0.1
 cpplint==1.6.0
diff --git a/share/requirements-dev-maya2019.txt b/share/requirements-dev-maya2019.txt
@@ -0,0 +1,5 @@
+# Expects Python 3.6.x
+black==22.8.0
+pylint==2.13.9
+flake8==4.0.1
+cpplint==1.6.0
diff --git a/share/requirements-dev-maya2020.txt b/share/requirements-dev-maya2020.txt
@@ -0,0 +1,5 @@
+# Expects Python 3.6.x
+black==22.8.0
+pylint==2.13.9
+flake8==4.0.1
+cpplint==1.6.0
diff --git a/share/requirements-dev-maya2022.txt b/share/requirements-dev-maya2022.txt
@@ -0,0 +1,5 @@
+# Expects Python 3.6.x
+black==22.8.0
+pylint==2.13.9
+flake8==4.0.1
+cpplint==1.6.0
diff --git a/share/requirements-dev-maya2023.txt b/share/requirements-dev-maya2023.txt
@@ -0,0 +1,5 @@
+# Expects Python 3.6.x
+black==22.8.0
+pylint==2.13.9
+flake8==4.0.1
+cpplint==1.6.0
diff --git a/share/requirements-dev-maya2024.txt b/share/requirements-dev-maya2024.txt
@@ -1 +1,6 @@
+# Expects Python 3.9.x
+black==24.3.0
+pylint==2.13.9
+flake8==4.0.1
+cpplint==1.6.0
 ruff==0.0.261
diff --git a/share/requirements-doc.txt → share/requirements-doc-maya2018.txt b/share/requirements-doc.txt → share/requirements-doc-maya2018.txt
@@ -1,2 +1,3 @@
+# Expects Python 3.6.x
 Sphinx>=4.5.0
 furo>=2022.2.23
diff --git a/share/requirements-doc-maya2019.txt b/share/requirements-doc-maya2019.txt
@@ -0,0 +1,3 @@
+# Expects Python 3.6.x
+Sphinx>=4.5.0
+furo>=2022.2.23
diff --git a/share/requirements-doc-maya2020.txt b/share/requirements-doc-maya2020.txt
@@ -0,0 +1,3 @@
+# Expects Python 3.6.x
+Sphinx>=4.5.0
+furo>=2022.2.23
diff --git a/share/requirements-doc-maya2022.txt b/share/requirements-doc-maya2022.txt
@@ -0,0 +1,3 @@
+# Expects Python 3.6.x
+Sphinx>=4.5.0
+furo>=2022.2.23
diff --git a/share/requirements-doc-maya2023.txt b/share/requirements-doc-maya2023.txt
@@ -0,0 +1,3 @@
+# Expects Python 3.6.x
+Sphinx>=4.5.0
+furo>=2022.2.23
diff --git a/share/requirements-doc-maya2024.txt b/share/requirements-doc-maya2024.txt
@@ -0,0 +1,3 @@
+# Expects Python 3.9.x
+Sphinx>=4.5.0
+furo>=2022.2.23