Skip to content

Commit 0de1006

Browse files
committed
tools/docker: remove python 3.8 support
1 parent 2b2a5f6 commit 0de1006

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

tools/docker/Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ help:
3333
@echo -e "\t${BOLD}test_archives${RESET}: Test each OR-Tools archives for all ${BOLD}<distro>${RESET} and ${BOLD}<lang>${RESET}."
3434
@echo
3535
@echo -e "${BOLD}PYTHON TARGETS${RESET}"
36-
@echo -e "\t${BOLD}python${RESET}: Build musllinux and manylinux python 'ortools' wheel packages (3.8+)."
37-
@echo -e "\t${BOLD}python_<platform>${RESET}: Build all python 'ortools' wheel packages (3.8+) for a specific platform."
38-
@echo -e "\t${BOLD}python_<platform>_<step>${RESET}: Build all python 'ortools' wheel packages (3.8+) for a specific platform."
39-
@echo -e "\t${BOLD}python_<target>_<step>${RESET}: Build python 'ortools' wheel packages (3.8+) for a specific target."
36+
@echo -e "\t${BOLD}python${RESET}: Build musllinux and manylinux python 'ortools' wheel packages (3.9+)."
37+
@echo -e "\t${BOLD}python_<platform>${RESET}: Build all python 'ortools' wheel packages (3.9+) for a specific platform."
38+
@echo -e "\t${BOLD}python_<platform>_<step>${RESET}: Build all python 'ortools' wheel packages (3.9+) for a specific platform."
39+
@echo -e "\t${BOLD}python_<target>_<step>${RESET}: Build python 'ortools' wheel packages (3.9+) for a specific target."
4040
@echo -e "\t${BOLD}save_python_<target>${RESET}: Save python 'ortools' image."
4141
@echo -e "\t${BOLD}clean_python_<target>${RESET}: Clean manylinux and musllinux python 'ortools' wheel packages."
4242
@echo -e "\t${BOLD}sh_python_<target>${RESET}: Run a container using the python 'ortools' image."
@@ -54,7 +54,6 @@ help:
5454
@echo -e "\t\t${BOLD}manylinux${RESET} (manylinux_2_28)"
5555
@echo
5656
@echo -e "\t${BOLD}<version>${RESET}:"
57-
@echo -e "\t\t${BOLD}38${RESET} Python3.8"
5857
@echo -e "\t\t${BOLD}39${RESET} Python3.9"
5958
@echo -e "\t\t${BOLD}310${RESET} Python3.10"
6059
@echo -e "\t\t${BOLD}311${RESET} Python3.11"
@@ -118,7 +117,7 @@ help:
118117
@echo -e "\t\t${BOLD}cpp${RESET} C++"
119118
@echo -e "\t\t${BOLD}dotnet${RESET} .Net Core 3.1 and/or .Net 6.0 wrappers"
120119
@echo -e "\t\t${BOLD}java${RESET} Java (JDK 8.0) wrappers"
121-
@echo -e "\t\t${BOLD}python${RESET} Python 3.8+ wrappers"
120+
@echo -e "\t\t${BOLD}python${RESET} Python 3.9+ wrappers"
122121
@echo
123122
@echo -e "\te.g. 'make sh_amd64_ubuntu-22.04_cpp_build'"
124123
@echo -e "\te.g. 'make amd64_ubuntu-22.04_cpp_archive'"
@@ -204,7 +203,7 @@ cache/python: | cache
204203
-mkdir $@
205204

206205
## MANYLINUX ##
207-
PYTHON_VERSIONS := 38 39 310 311 312 313
206+
PYTHON_VERSIONS := 39 310 311 312 313
208207

209208
export/python/manylinux: | export/python
210209
-mkdir -p $@

tools/docker/python/build-manylinux.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DESCRIPTION
3535
3636
\tYou MUST define the following variables before running this script:
3737
\t* PLATFORM: x86_64 aarch64
38-
\t* PYTHON_VERSION: 3 38 39 310 311 312 313
38+
\t* PYTHON_VERSION: 3 39 310 311 312 313
3939
note: PYTHON_VERSION=3 will generate for all pythons which could take time...
4040
4141
OPTIONS
@@ -123,7 +123,6 @@ function check_wheel() {
123123
# Check mypy files
124124
declare -a MYPY_FILES=(
125125
"ortools/algorithms/python/knapsack_solver.pyi"
126-
"ortools/algorithms/python/set_cover.pyi"
127126
"ortools/constraint_solver/pywrapcp.pyi"
128127
"ortools/graph/python/linear_sum_assignment.pyi"
129128
"ortools/graph/python/max_flow.pyi"
@@ -134,6 +133,7 @@ function check_wheel() {
134133
"ortools/pdlp/python/pdlp.pyi"
135134
"ortools/sat/python/cp_model_helper.pyi"
136135
"ortools/scheduling/python/rcpsp.pyi"
136+
"ortools/set_cover/python/set_cover.pyi"
137137
"ortools/util/python/sorted_interval_list.pyi"
138138
)
139139
for FILE in "${MYPY_FILES[@]}"; do
@@ -264,7 +264,7 @@ function main() {
264264
assert_defined PYTHON_VERSION
265265

266266
# Setup
267-
declare -a SKIPS=( "pp37-pypy37_pp73" )
267+
declare -a SKIPS=( "cp38-cp38" )
268268

269269
case ${1} in
270270
build)

tools/docker/python/build-musllinux.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ DESCRIPTION
3535
3636
\tYou MUST define the following variables before running this script:
3737
\t* PLATFORM: x86_64 aarch64
38-
\t* PYTHON_VERSION: 3 38 39 310 311 312 313
38+
\t* PYTHON_VERSION: 3 39 310 311 312 313
3939
note: PYTHON_VERSION=3 will generate for all pythons which could take time...
4040
4141
OPTIONS
@@ -118,7 +118,6 @@ function check_wheel() {
118118
# Check mypy files
119119
declare -a MYPY_FILES=(
120120
"ortools/algorithms/python/knapsack_solver.pyi"
121-
"ortools/algorithms/python/set_cover.pyi"
122121
"ortools/constraint_solver/pywrapcp.pyi"
123122
"ortools/graph/python/linear_sum_assignment.pyi"
124123
"ortools/graph/python/max_flow.pyi"
@@ -129,6 +128,7 @@ function check_wheel() {
129128
"ortools/pdlp/python/pdlp.pyi"
130129
"ortools/sat/python/cp_model_helper.pyi"
131130
"ortools/scheduling/python/rcpsp.pyi"
131+
"ortools/set_cover/python/set_cover.pyi"
132132
"ortools/util/python/sorted_interval_list.pyi"
133133
)
134134
for FILE in "${MYPY_FILES[@]}"; do
@@ -255,7 +255,7 @@ function main() {
255255
assert_defined PYTHON_VERSION
256256

257257
# Setup
258-
declare -a SKIPS=( "cp36-cp36m" "cp37-cp37m" )
258+
declare -a SKIPS=( "cp38-cp38" )
259259

260260
case ${1} in
261261
build)

0 commit comments

Comments
 (0)