diff --git a/tools/docker/Makefile b/tools/docker/Makefile index d0803291e6..dbc2101ee9 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -33,10 +33,10 @@ help: @echo -e "\t${BOLD}test_archives${RESET}: Test each OR-Tools archives for all ${BOLD}${RESET} and ${BOLD}${RESET}." @echo @echo -e "${BOLD}PYTHON TARGETS${RESET}" - @echo -e "\t${BOLD}python${RESET}: Build musllinux and manylinux python 'ortools' wheel packages (3.8+)." - @echo -e "\t${BOLD}python_${RESET}: Build all python 'ortools' wheel packages (3.8+) for a specific platform." - @echo -e "\t${BOLD}python__${RESET}: Build all python 'ortools' wheel packages (3.8+) for a specific platform." - @echo -e "\t${BOLD}python__${RESET}: Build python 'ortools' wheel packages (3.8+) for a specific target." + @echo -e "\t${BOLD}python${RESET}: Build musllinux and manylinux python 'ortools' wheel packages (3.9+)." + @echo -e "\t${BOLD}python_${RESET}: Build all python 'ortools' wheel packages (3.9+) for a specific platform." + @echo -e "\t${BOLD}python__${RESET}: Build all python 'ortools' wheel packages (3.9+) for a specific platform." + @echo -e "\t${BOLD}python__${RESET}: Build python 'ortools' wheel packages (3.9+) for a specific target." @echo -e "\t${BOLD}save_python_${RESET}: Save python 'ortools' image." @echo -e "\t${BOLD}clean_python_${RESET}: Clean manylinux and musllinux python 'ortools' wheel packages." @echo -e "\t${BOLD}sh_python_${RESET}: Run a container using the python 'ortools' image." @@ -54,7 +54,6 @@ help: @echo -e "\t\t${BOLD}manylinux${RESET} (manylinux_2_28)" @echo @echo -e "\t${BOLD}${RESET}:" - @echo -e "\t\t${BOLD}38${RESET} Python3.8" @echo -e "\t\t${BOLD}39${RESET} Python3.9" @echo -e "\t\t${BOLD}310${RESET} Python3.10" @echo -e "\t\t${BOLD}311${RESET} Python3.11" @@ -118,7 +117,7 @@ help: @echo -e "\t\t${BOLD}cpp${RESET} C++" @echo -e "\t\t${BOLD}dotnet${RESET} .Net Core 3.1 and/or .Net 6.0 wrappers" @echo -e "\t\t${BOLD}java${RESET} Java (JDK 8.0) wrappers" - @echo -e "\t\t${BOLD}python${RESET} Python 3.8+ wrappers" + @echo -e "\t\t${BOLD}python${RESET} Python 3.9+ wrappers" @echo @echo -e "\te.g. 'make sh_amd64_ubuntu-22.04_cpp_build'" @echo -e "\te.g. 'make amd64_ubuntu-22.04_cpp_archive'" @@ -204,7 +203,7 @@ cache/python: | cache -mkdir $@ ## MANYLINUX ## -PYTHON_VERSIONS := 38 39 310 311 312 313 +PYTHON_VERSIONS := 39 310 311 312 313 export/python/manylinux: | export/python -mkdir -p $@ diff --git a/tools/docker/python/build-manylinux.sh b/tools/docker/python/build-manylinux.sh index c3b86c770a..3bbf69e7c7 100755 --- a/tools/docker/python/build-manylinux.sh +++ b/tools/docker/python/build-manylinux.sh @@ -35,7 +35,7 @@ DESCRIPTION \tYou MUST define the following variables before running this script: \t* PLATFORM: x86_64 aarch64 -\t* PYTHON_VERSION: 3 38 39 310 311 312 313 +\t* PYTHON_VERSION: 3 39 310 311 312 313 note: PYTHON_VERSION=3 will generate for all pythons which could take time... OPTIONS @@ -123,7 +123,6 @@ function check_wheel() { # Check mypy files declare -a MYPY_FILES=( "ortools/algorithms/python/knapsack_solver.pyi" - "ortools/algorithms/python/set_cover.pyi" "ortools/constraint_solver/pywrapcp.pyi" "ortools/graph/python/linear_sum_assignment.pyi" "ortools/graph/python/max_flow.pyi" @@ -134,6 +133,7 @@ function check_wheel() { "ortools/pdlp/python/pdlp.pyi" "ortools/sat/python/cp_model_helper.pyi" "ortools/scheduling/python/rcpsp.pyi" + "ortools/set_cover/python/set_cover.pyi" "ortools/util/python/sorted_interval_list.pyi" ) for FILE in "${MYPY_FILES[@]}"; do @@ -264,7 +264,7 @@ function main() { assert_defined PYTHON_VERSION # Setup - declare -a SKIPS=( "pp37-pypy37_pp73" ) + declare -a SKIPS=( "cp38-cp38" ) case ${1} in build) diff --git a/tools/docker/python/build-musllinux.sh b/tools/docker/python/build-musllinux.sh index f404912565..846e636c3f 100755 --- a/tools/docker/python/build-musllinux.sh +++ b/tools/docker/python/build-musllinux.sh @@ -35,7 +35,7 @@ DESCRIPTION \tYou MUST define the following variables before running this script: \t* PLATFORM: x86_64 aarch64 -\t* PYTHON_VERSION: 3 38 39 310 311 312 313 +\t* PYTHON_VERSION: 3 39 310 311 312 313 note: PYTHON_VERSION=3 will generate for all pythons which could take time... OPTIONS @@ -118,7 +118,6 @@ function check_wheel() { # Check mypy files declare -a MYPY_FILES=( "ortools/algorithms/python/knapsack_solver.pyi" - "ortools/algorithms/python/set_cover.pyi" "ortools/constraint_solver/pywrapcp.pyi" "ortools/graph/python/linear_sum_assignment.pyi" "ortools/graph/python/max_flow.pyi" @@ -129,6 +128,7 @@ function check_wheel() { "ortools/pdlp/python/pdlp.pyi" "ortools/sat/python/cp_model_helper.pyi" "ortools/scheduling/python/rcpsp.pyi" + "ortools/set_cover/python/set_cover.pyi" "ortools/util/python/sorted_interval_list.pyi" ) for FILE in "${MYPY_FILES[@]}"; do @@ -255,7 +255,7 @@ function main() { assert_defined PYTHON_VERSION # Setup - declare -a SKIPS=( "cp36-cp36m" "cp37-cp37m" ) + declare -a SKIPS=( "cp38-cp38" ) case ${1} in build)