Skip to content

Commit

Permalink
confluent-docker-utils/0.0.129 package update (#36827)
Browse files Browse the repository at this point in the history
Theres some work going on to make python v3.13 the default in wolfi,
which is separate to this PR. It looks like this package has issues with
python v3.13, so pinning to v3.12.

----------

<p align="center">
<img
src="https://raw.githubusercontent.com/wolfi-dev/.github/b535a42419ce0edb3c144c0edcff55a62b8ec1f8/profile/wolfi-logo-light-mode.svg"
/>
</p>

---------

Signed-off-by: wolfi-bot <[email protected]>
Signed-off-by: Mark McCormick <[email protected]>
Co-authored-by: wolfi-bot <[email protected]>
Co-authored-by: Mark McCormick <[email protected]>
  • Loading branch information
3 people authored Dec 13, 2024
1 parent df19d3a commit 0a6a195
Showing 1 changed file with 23 additions and 16 deletions.
39 changes: 23 additions & 16 deletions confluent-docker-utils.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#nolint:git-checkout-must-use-github-updates
package:
name: confluent-docker-utils
version: 0.0.127
version: 0.0.129
epoch: 0
description: This package provides Docker Utility Belt (dub) and Confluent Platform Utility Belt (cub).
copyright:
Expand All @@ -10,27 +10,28 @@ package:
no-depends: true
dependencies:
runtime:
- py3-setuptools # To fix `No module named 'distutils'`
- python3
- py${{vars.py-version}}-setuptools # To fix `No module named 'distutils'`

vars:
# This will compile with py3.13, however tests will fail with errors:
# 'ModuleNotFoundError: No module named 'pipes'
# - https://github.com/jupyter/nbclassic/issues/308
# Upstream may have to make some code changes to be compatible with py3.13.
py-version: 3.12

environment:
contents:
packages:
- busybox
- ca-certificates-bundle
- cython
- py3-gpep517
- py3-installer
- py3-pip
- py3-setuptools
- py3-wheel
- python-3
- python-3-dev
- py${{vars.py-version}}-build-base-dev
- py${{vars.py-version}}-gpep517

pipeline:
- uses: git-checkout
with:
expected-commit: 964dc5fa47e7b361f3fff5854e3fd6e77e95a8d0
expected-commit: 03c11854dddd276004e69c533496cd5803e9abdc
repository: https://github.com/confluentinc/confluent-docker-utils
tag: v${{package.version}}

Expand All @@ -40,25 +41,28 @@ pipeline:
echo 'PyYAML==6.0.1' >> requirements.txt
- runs: |
python3 -m gpep517 build-wheel \
python3=python${{vars.py-version}}
$python3 -m gpep517 build-wheel \
--wheel-dir dist \
--output-fd 3 3>&1 >&2
python3 -m installer \
$python3 -m installer \
-d "${{targets.destdir}}" \
dist/*.whl
install -Dm644 LICENSE \
"${{targets.destdir}}"/usr/share/licenses/${{package.name}}/LICENSE
- runs: |
python3=python${{vars.py-version}}
# `--use-deprecated=legacy-resolver` is used force ignore the dependency check.
# `docker-compose` was requiring `PyYAML<6` and also `PyYAML==5.4.1` was causing
# `AttributeError: cython_sources` issue.
pip install --root=${{targets.destdir}} --prefix=/usr --prefer-binary --use-deprecated=legacy-resolver -r requirements.txt
pip install --root=${{targets.destdir}} --prefix=/usr setuptools
$python3 -m pip install --root=${{targets.destdir}} --prefix=/usr --prefer-binary --use-deprecated=legacy-resolver -r requirements.txt
$python3 -m pip install --root=${{targets.destdir}} --prefix=/usr setuptools
find ${{targets.destdir}} -name "*.pyc" -exec rm -rf '{}' +
- runs: |
_py3ver=$(python3 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
python3=python${{vars.py-version}}
_py3ver=$($python3 -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
mkdir -p ${{targets.destdir}}/usr/lib/python"$_py3ver"/site-packages/confluent/docker_utils
cp -r confluent/docker_utils/* ${{targets.destdir}}/usr/lib/python"$_py3ver"/site-packages/confluent/docker_utils/
Expand Down Expand Up @@ -87,3 +91,6 @@ test:
jsonschema --help
normalizer --version
normalizer --help
- uses: python/import
with:
import: confluent.docker_utils

0 comments on commit 0a6a195

Please sign in to comment.