Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,6 @@ ifeq ($(shell echo $(PUSH) | tr [:upper:] [:lower:] ),true)
docker push 353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-r-base:$(VERSION)
endif

ifneq ($(CI), 1)
dev-python-3.6-jdk-%: dev-python-3.6
endif
dev-python-3.6-jdk-%:
docker build -t 353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-python-3.6-jdk-$*:$(VERSION) \
$(NO_CACHE) \
-f jenkins-images/Dockerfile-jdk-others \
--build-arg FROM_VERSION=$(VERSION) \
--build-arg FROM_IMAGE=353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-python-3.6 \
--build-arg INSTALL_JAVA_VERSION=$* \
--build-arg H2O_BRANCH=$(H2O_BRANCH) \
.
ifeq ($(shell echo $(PUSH) | tr [:upper:] [:lower:] ),true)
docker push 353750902984.dkr.ecr.us-east-1.amazonaws.com/h2o-3/dev-python-3.6-jdk-$*:$(VERSION)
endif

ifneq ($(CI), 1)
dev-python-3.7-jdk-%: dev-python-3.7
endif
Expand Down
24 changes: 4 additions & 20 deletions docker/scripts/install_python_version
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,15 @@ for python_version in "${array[@]}"; do
if [[ ${major} == "2" ]] ; then pkg_suffix="" ; else pkg_suffix=${major} ; fi

apt-get update
if [[ ${python_version} == "3.6" ]]
then
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
pushd /usr/src
wget -nv https://www.python.org/ftp/python/3.6.15/Python-3.6.15.tar.xz
echo "bc04aa6c2a1a172a35012abd668538cd Python-3.6.15.tar.xz" > Python-3.6.15.tar.xz.md5
md5sum -c Python-3.6.15.tar.xz.md5 || exit 1 # unexpected checksum
tar xf Python-3.6.15.tar.xz
cd Python-3.6.15
export CC="clang" # needed to avoid SegFault during install
./configure
make
make install
popd
else
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version} python${python_version}-dev python${pkg_suffix}-setuptools
if [[ ${major} -ge 3 && ${minor} -ge 7 ]]; then
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version}-distutils
fi
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version} python${python_version}-dev python${pkg_suffix}-setuptools
if [[ ${major} -ge 3 && ${minor} -ge 7 ]]; then
DEBIAN_FRONTEND=noninteractive apt-get -y install python${python_version}-distutils
fi
apt-get clean
rm -rf /var/cache/apt/*

echo "###### Installing pip for Python ${python_version} ######"
if [[ ${major} == "2" ]] || [[ ${python_version} == "3.5" ]] || [[ ${python_version} == "3.6" ]] || [[ ${python_version} == "3.7" ]]
if [[ ${major} == "2" ]] || [[ ${python_version} == "3.5" ]] || [[ ${python_version} == "3.7" ]]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I modify this in my PR since you have to use this method to get pip for 3.8 as well now. I'd be in favor of removing this change so there is no unnecessary conflict. Also I don't understand the reason of removing support for 3.6 but not 3.5 and 2.x.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, if you already cover it in your PR, then I can fully skip it.

then
curl https://bootstrap.pypa.io/pip/${python_version}/get-pip.py --output get-pip.py
python${python_version} get-pip.py
Expand Down
23 changes: 8 additions & 15 deletions h2o-py/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
requests==2.27.1
winkerberos >= 0.5.0; sys.platform == 'win32'
pykerberos >= 1.1.8, < 2.0.0; sys.platform != 'win32'
gssapi==1.6.14; python_version == '3.6'
gssapi==1.8.3; python_version > '3.6'
gssapi==1.8.3
tabulate==0.8.10
slam==0.6.0
cython==0.29.34
twine==1.10.0
urllib3==1.26.5
grip==4.4.0
wheel<=0.42.0; python_version < '3.7'
wheel==0.42.0; python_version >= '3.7'
wheel==0.42.0
numpy<=1.23.5; python_version < '3.8'
numpy==1.23.5; python_version >= '3.8'
numpy==1.26.4; python_version == '3.11'
scipy==1.5.4; python_version == '3.6'
scipy==1.6.3; python_version == '3.7'
scipy==1.10.1; python_version > '3.7'
pandas==0.24.2; python_version == '3.6'
pandas==1.3.5; python_version > '3.6' and python_version < '3.11'
pandas==1.3.5; python_version < '3.11'
pandas==1.5.3; python_version >= '3.11'
pyarrow==10.0.1; python_version > '3.6'
statsmodels==0.12.2; python_version == '3.6'
statsmodels==0.13.5; python_version > '3.6'
pyarrow==10.0.1
statsmodels==0.13.5
patsy==0.5.3
scikit-learn==0.24.2; python_version <= '3.7'
scikit-learn==1.2.2; python_version > '3.7'
Expand All @@ -48,12 +43,10 @@ polars==0.19.17; python_version > '3.9'
pyarrow==14.0.1; python_version > '3.9'
# not directly required, pinned by Snyk to avoid a vulnerability
pygments==2.15.1; python_version >= '3.7'
sphinx==3.5.4; python_version >= '3.6' and python_version <= '3.8'
sphinx==3.5.4; python_version <= '3.8'
sphinx==6.1.3; python_version > '3.8'
typing_extensions==4.1.1; python_version < '3.7'
typing_extensions==4.7.1; python_version >= '3.7' and python_version < '3.8'
typing_extensions==4.7.1; python_version < '3.8'
typing_extensions==4.9.0; python_version >= '3.8'
mypy==0.971; python_version < '3.7'
mypy==1.4.1; python_version >= '3.7' and python_version < '3.8'
mypy==1.4.1; python_version < '3.8'
mypy==1.8.0; python_version >= '3.8'
future; python_version == '3.11'