Skip to content
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/build-notebooks-TEMPLATE.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ jobs:
if [[ "${{ inputs.platform }}" == "linux/s390x" ]]; then
# workaround for known issue https://github.com/zeromq/libzmq/pull/4486
# In qemu-user, CACHELINE_SIZE probe is undefined
EXTRA_PODMAN_BUILD_ARGS+='--env=CXXFLAGS=-Dundefined=64'
# Compiling pyzmq through UV needs this in CFLAGS
EXTRA_PODMAN_BUILD_ARGS+='--env=CFLAGS=-Dundefined=64 --env=CXXFLAGS=-Dundefined=64 --unsetenv=CFLAGS --unsetenv=CXXFLAGS'
fi
echo "EXTRA_PODMAN_BUILD_ARGS=$EXTRA_PODMAN_BUILD_ARGS" >> $GITHUB_OUTPUT

Expand Down Expand Up @@ -325,13 +326,12 @@ jobs:

# https://github.com/astral-sh/setup-uv
- name: Install the latest version of uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v7
with:
version: "latest"
python-version: "3.14"
enable-cache: true
cache-dependency-glob: "uv.lock"
pyproject-file: "pyproject.toml"

- name: Check uv is installed correctly
run: uv version
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/code-quality.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,14 @@ jobs:
steps:
- uses: actions/checkout@v5

- uses: actions/setup-python@v5
# https://github.com/astral-sh/setup-uv
- name: Install the latest version of uv
uses: astral-sh/setup-uv@v7
with:
python-version-file: '.python-version'
version: "latest"
python-version: "3.14"
enable-cache: true
cache-dependency-glob: "uv.lock"

- name: Rerun all code generators we have
run: bash ci/generate_code.sh
Expand All @@ -40,13 +45,12 @@ jobs:

# https://github.com/astral-sh/setup-uv
- name: Install the latest version of uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v7
with:
version: "latest"
python-version: "3.14"
enable-cache: true
cache-dependency-glob: "uv.lock"
pyproject-file: "pyproject.toml"

- name: Check uv is installed correctly
run: uv version
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ jobs:

# https://github.com/astral-sh/setup-uv
- name: Install the latest version of uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v7
with:
version: "latest"
python-version: "3.14"
enable-cache: true
cache-dependency-glob: "uv.lock"
pyproject-file: "pyproject.toml"

- name: Run the release notes script
run: |
Expand Down
2 changes: 1 addition & 1 deletion ci/generate_code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ set -Eeuxo pipefail

uv --version || pip install "uv==0.9.6"

python3 scripts/dockerfile_fragments.py
uv run scripts/dockerfile_fragments.py
bash scripts/pylocks_generator.sh
10 changes: 7 additions & 3 deletions codeserver/ubi9-python-3.12/Dockerfile.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,13 @@ FROM ${BASE_IMAGE} AS cpu-base

WORKDIR /opt/app-root/bin

# RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

# OS Packages needs to be installed as root
USER 0
Expand Down
2,112 changes: 24 additions & 2,088 deletions codeserver/ubi9-python-3.12/pylock.toml

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ ARG MINIMAL_SOURCE_CODE=jupyter/minimal/ubi9-python-3.12

WORKDIR /opt/app-root/bin

### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

COPY ${JUPYTER_REUSABLE_UTILS} utils/
COPY ${MINIMAL_SOURCE_CODE}/start-notebook.sh ./

Expand Down
3,631 changes: 38 additions & 3,593 deletions jupyter/datascience/ubi9-python-3.12/pylock.toml

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions jupyter/minimal/ubi9-python-3.12/Dockerfile.cpu
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@ FROM registry.access.redhat.com/ubi9/ubi AS ubi-repos
####################
FROM ${BASE_IMAGE} AS cpu-base

# RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_EXTRA_INDEX_URL=https://pypi.org/simple
ENV UV_EXTRA_INDEX_URL=https://pypi.org/simple
### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

WORKDIR /opt/app-root/bin

Expand Down
8 changes: 8 additions & 0 deletions jupyter/minimal/ubi9-python-3.12/Dockerfile.cuda
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ ARG BASE_IMAGE
####################
FROM ${BASE_IMAGE} AS cuda-base

### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

WORKDIR /opt/app-root/bin

# OS Packages needs to be installed as root
Expand Down
8 changes: 8 additions & 0 deletions jupyter/minimal/ubi9-python-3.12/Dockerfile.rocm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ ARG BASE_IMAGE
####################
FROM ${BASE_IMAGE} AS rocm-base

### BEGIN RHAIENG-2189: this is AIPCC migration phase 1.5
ENV PIP_INDEX_URL=https://pypi.org/simple
# UV_INDEX_URL is deprecated in favor of UV_DEFAULT_INDEX
ENV UV_INDEX_URL=https://pypi.org/simple
# https://docs.astral.sh/uv/reference/environment/#uv_default_index
ENV UV_DEFAULT_INDEX=https://pypi.org/simple
### END RHAIENG-2189: this is AIPCC migration phase 1.5

WORKDIR /opt/app-root/bin

# OS Packages needs to be installed as root
Expand Down
Loading
Loading