Skip to content

Commit

Permalink
GH-16542 Build rest of the images (#16581)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
valenad1 authored Feb 28, 2025
1 parent 94aead0 commit b9a8cb1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
8 changes: 4 additions & 4 deletions docker/Jenkinsfile-build-docker
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ properties([

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

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

def pipelineContext

Expand Down
4 changes: 2 additions & 2 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ SHELL := /bin/bash
THIS_FILE := $(lastword $(MAKEFILE_LIST))
.PHONY : all

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

dev-base:
Expand Down
3 changes: 2 additions & 1 deletion docker/jenkins-images/Dockerfile-release
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ RUN \

# Install conda
RUN \
curl -sSL https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o /tmp/miniconda.sh && \
# 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.
curl -sSL https://repo.continuum.io/miniconda/Miniconda3-py37_4.12.0-Linux-x86_64.sh -o /tmp/miniconda.sh && \
bash /tmp/miniconda.sh -bfp /usr/local && \
rm /tmp/miniconda.sh && \
conda install -y anaconda-client conda-build && \
Expand Down
5 changes: 4 additions & 1 deletion h2o-py/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@ wheel<=0.42.0; python_version < '3.7'
wheel==0.42.0; python_version >= '3.7'
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'
pandas==1.3.5; python_version > '3.6' and 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'
Expand Down Expand Up @@ -54,3 +56,4 @@ 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.8.0; python_version >= '3.8'
future; python_version == '3.11'

0 comments on commit b9a8cb1

Please sign in to comment.