Skip to content

Commit b9a8cb1

Browse files
authored
GH-16542 Build rest of the images (#16581)
* try to build what is missing * fix python 3.11 numpy package * install future for python 3.11 * Fix for No module named 'pandas.util.testing' * Fix makefile default values changed by mistake * Downgrade miniconda to fix release image * Add R version that was built before to have a complete list * Comment conda downgrade
1 parent 94aead0 commit b9a8cb1

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

docker/Jenkinsfile-build-docker

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ properties([
2121

2222
// IMAGE_NAME_PREFIX = 'harbor.h2o.ai/opsh2oai/h2o-3'
2323

24-
JDK_VERSIONS = ['8']
25-
JDK_VERSIONS_PY_R = ['8'] // stable, last-supported, latest
26-
PYTHON_VERSIONS = ['3.7']
27-
R_VERSION = ['3.4.1']
24+
JDK_VERSIONS = ['8', '11', '17']
25+
JDK_VERSIONS_PY_R = ['8', '11', '17'] // stable, last-supported, latest
26+
PYTHON_VERSIONS = ['3.6', '3.7','3.8', '3.9', '3.10', '3.11']
27+
R_VERSION = ['3.4.1', '3.5.3', '4.4.0']
2828

2929
def pipelineContext
3030

docker/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ SHELL := /bin/bash
22
THIS_FILE := $(lastword $(MAKEFILE_LIST))
33
.PHONY : all
44

5-
VERSION ?= 45
5+
VERSION ?= dev
66
PUSH ?= 0
77
H2O_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
8-
NO_CACHE ?=
8+
NO_CACHE ?= --no-cache
99
BASE_FROM_IMAGE := nvidia/cuda:12.1.0-devel-ubuntu22.04
1010

1111
dev-base:

docker/jenkins-images/Dockerfile-release

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ RUN \
1010

1111
# Install conda
1212
RUN \
13-
curl -sSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o /tmp/miniconda.sh && \
13+
# Downgrade conda because conda packages cannot be converted on the latest version. If you upgrade, run test release to check if conda can be build and converted.
14+
curl -sSL https://repo.continuum.io/miniconda/Miniconda3-py37_4.12.0-Linux-x86_64.sh -o /tmp/miniconda.sh && \
1415
bash /tmp/miniconda.sh -bfp /usr/local && \
1516
rm /tmp/miniconda.sh && \
1617
conda install -y anaconda-client conda-build && \

h2o-py/test-requirements.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ wheel<=0.42.0; python_version < '3.7'
1313
wheel==0.42.0; python_version >= '3.7'
1414
numpy<=1.23.5; python_version < '3.8'
1515
numpy==1.23.5; python_version >= '3.8'
16+
numpy==1.26.4; python_version == '3.11'
1617
scipy==1.5.4; python_version == '3.6'
1718
scipy==1.6.3; python_version == '3.7'
1819
scipy==1.10.1; python_version > '3.7'
1920
pandas==0.24.2; python_version == '3.6'
20-
pandas==1.3.5; python_version > '3.6'
21+
pandas==1.3.5; python_version > '3.6' and python_version < '3.11'
22+
pandas==1.5.3; python_version >= '3.11'
2123
pyarrow==10.0.1; python_version > '3.6'
2224
statsmodels==0.12.2; python_version == '3.6'
2325
statsmodels==0.13.5; python_version > '3.6'
@@ -54,3 +56,4 @@ typing_extensions==4.9.0; python_version >= '3.8'
5456
mypy==0.971; python_version < '3.7'
5557
mypy==1.4.1; python_version >= '3.7' and python_version < '3.8'
5658
mypy==1.8.0; python_version >= '3.8'
59+
future; python_version == '3.11'

0 commit comments

Comments
 (0)