diff --git a/scripts/internal/python_venv_activate.bash b/scripts/internal/python_venv_activate.bash index 4a7e5396f..de08e353a 100755 --- 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 index 6e7deacc8..6262bad57 100644 --- 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 b/share/requirements-dev-maya2018.txt similarity index 54% rename from share/requirements-dev.txt rename to share/requirements-dev-maya2018.txt index 86ac84c72..500c54c32 100644 --- a/share/requirements-dev.txt +++ b/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 new file mode 100644 index 000000000..500c54c32 --- /dev/null +++ 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 new file mode 100644 index 000000000..500c54c32 --- /dev/null +++ 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 new file mode 100644 index 000000000..500c54c32 --- /dev/null +++ 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 new file mode 100644 index 000000000..500c54c32 --- /dev/null +++ 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 index 2bc0c6f01..856ef8f07 100644 --- 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 b/share/requirements-doc-maya2018.txt similarity index 56% rename from share/requirements-doc.txt rename to share/requirements-doc-maya2018.txt index 89637b009..91e78f95a 100644 --- a/share/requirements-doc.txt +++ b/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 new file mode 100644 index 000000000..91e78f95a --- /dev/null +++ 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 new file mode 100644 index 000000000..91e78f95a --- /dev/null +++ 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 new file mode 100644 index 000000000..91e78f95a --- /dev/null +++ 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 new file mode 100644 index 000000000..91e78f95a --- /dev/null +++ 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 new file mode 100644 index 000000000..2fdd0f4a6 --- /dev/null +++ b/share/requirements-doc-maya2024.txt @@ -0,0 +1,3 @@ +# Expects Python 3.9.x +Sphinx>=4.5.0 +furo>=2022.2.23