Skip to content

Commit 54e62e5

Browse files
committed
Remove Python 3.6 Docker build support
- Remove python-3.6-jdk-* build targets from docker/Makefile - Remove Python 3.6 special build-from-source handling in install_python_version - Update pip installation conditional to exclude Python 3.6 - Update test-requirements.txt
1 parent c8bb6db commit 54e62e5

File tree

3 files changed

+12
-51
lines changed

3 files changed

+12
-51
lines changed

docker/Makefile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,6 @@ ifeq ($(shell echo $(PUSH) | tr [:upper:] [:lower:] ),true)
7171
docker push 353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-r-base:$(VERSION)
7272
endif
7373

74-
ifneq ($(CI), 1)
75-
dev-python-3.6-jdk-%: dev-python-3.6
76-
endif
77-
dev-python-3.6-jdk-%:
78-
docker build -t 353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-python-3.6-jdk-$*:$(VERSION) \
79-
$(NO_CACHE) \
80-
-f jenkins-images/Dockerfile-jdk-others \
81-
--build-arg FROM_VERSION=$(VERSION) \
82-
--build-arg FROM_IMAGE=353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-python-3.6 \
83-
--build-arg INSTALL_JAVA_VERSION=$* \
84-
--build-arg H2O_BRANCH=$(H2O_BRANCH) \
85-
.
86-
ifeq ($(shell echo $(PUSH) | tr [:upper:] [:lower:] ),true)
87-
docker push 353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-python-3.6-jdk-$*:$(VERSION)
88-
endif
89-
9074
ifneq ($(CI), 1)
9175
dev-python-3.7-jdk-%: dev-python-3.7
9276
endif

docker/scripts/install_python_version

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,15 @@ for python_version in "${array[@]}"; do
3434
if [[ ${major} == "2" ]] ; then pkg_suffix="" ; else pkg_suffix=${major} ; fi
3535

3636
apt-get update
37-
if [[ ${python_version} == "3.6" ]]
38-
then
39-
DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential checkinstall libreadline-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev clang
40-
pushd /usr/src
41-
wget -nv https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tar.xz
42-
echo "bc04aa6c2a1a172a35012abd668538cd Python-3.6.15.tar.xz" > Python-3.6.15.tar.xz.md5
43-
md5sum -c Python-3.6.15.tar.xz.md5 || exit 1 # unexpected checksum
44-
tar xf Python-3.6.15.tar.xz
45-
cd Python-3.6.15
46-
export CC="clang" # needed to avoid SegFault during install
47-
./configure
48-
make
49-
make install
50-
popd
51-
else
52-
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version} python${python_version}-dev python${pkg_suffix}-setuptools
53-
if [[ ${major} -ge 3 && ${minor} -ge 7 ]]; then
54-
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version}-distutils
55-
fi
37+
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version} python${python_version}-dev python${pkg_suffix}-setuptools
38+
if [[ ${major} -ge 3 && ${minor} -ge 7 ]]; then
39+
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version}-distutils
5640
fi
5741
apt-get clean
5842
rm -rf /var/cache/apt/*
5943

6044
echo "###### Installing pip for Python ${python_version} ######"
61-
if [[ ${major} == "2" ]] || [[ ${python_version} == "3.5" ]] || [[ ${python_version} == "3.6" ]] || [[ ${python_version} == "3.7" ]]
45+
if [[ ${major} == "2" ]] || [[ ${python_version} == "3.5" ]] || [[ ${python_version} == "3.7" ]]
6246
then
6347
curl https://bootstrap.pypa.io/pip/${python_version}/get-pip.py --output get-pip.py
6448
python${python_version} get-pip.py

h2o-py/test-requirements.txt

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
requests==2.27.1
22
winkerberos >= 0.5.0; sys.platform == 'win32'
33
pykerberos >= 1.1.8, < 2.0.0; sys.platform != 'win32'
4-
gssapi==1.6.14; python_version == '3.6'
5-
gssapi==1.8.3; python_version > '3.6'
4+
gssapi==1.8.3
65
tabulate==0.8.10
76
slam==0.6.0
87
cython==0.29.34
98
twine==1.10.0
109
urllib3==1.26.5
1110
grip==4.4.0
12-
wheel<=0.42.0; python_version < '3.7'
13-
wheel==0.42.0; python_version >= '3.7'
11+
wheel==0.42.0
1412
numpy<=1.23.5; python_version < '3.8'
1513
numpy==1.23.5; python_version >= '3.8'
1614
numpy==1.26.4; python_version == '3.11'
17-
scipy==1.5.4; python_version == '3.6'
1815
scipy==1.6.3; python_version == '3.7'
1916
scipy==1.10.1; python_version > '3.7'
20-
pandas==0.24.2; python_version == '3.6'
21-
pandas==1.3.5; python_version > '3.6' and python_version < '3.11'
17+
pandas==1.3.5; python_version < '3.11'
2218
pandas==1.5.3; python_version >= '3.11'
23-
pyarrow==10.0.1; python_version > '3.6'
24-
statsmodels==0.12.2; python_version == '3.6'
25-
statsmodels==0.13.5; python_version > '3.6'
19+
pyarrow==10.0.1
20+
statsmodels==0.13.5
2621
patsy==0.5.3
2722
scikit-learn==0.24.2; python_version <= '3.7'
2823
scikit-learn==1.2.2; python_version > '3.7'
@@ -48,12 +43,10 @@ polars==0.19.17; python_version > '3.9'
4843
pyarrow==14.0.1; python_version > '3.9'
4944
# not directly required, pinned by Snyk to avoid a vulnerability
5045
pygments==2.15.1; python_version >= '3.7'
51-
sphinx==3.5.4; python_version >= '3.6' and python_version <= '3.8'
46+
sphinx==3.5.4; python_version <= '3.8'
5247
sphinx==6.1.3; python_version > '3.8'
53-
typing_extensions==4.1.1; python_version < '3.7'
54-
typing_extensions==4.7.1; python_version >= '3.7' and python_version < '3.8'
48+
typing_extensions==4.7.1; python_version < '3.8'
5549
typing_extensions==4.9.0; python_version >= '3.8'
56-
mypy==0.971; python_version < '3.7'
57-
mypy==1.4.1; python_version >= '3.7' and python_version < '3.8'
50+
mypy==1.4.1; python_version < '3.8'
5851
mypy==1.8.0; python_version >= '3.8'
5952
future; python_version == '3.11'

0 commit comments

Comments
 (0)