From def6c16bf55d845ff0fecc884383457257565025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 May 2025 10:50:51 +0200 Subject: [PATCH 1/2] Revert "Temporarily disable CI test that builds wheel of pygit2" This reverts commit 3ab3c788ef8197ce5310de3becd810e7ebc16c37. --- .github/workflows/build-and-push.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index e6fb367..50b84c0 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -59,12 +59,11 @@ jobs: TOXENV: ${{ matrix.toxenv }} run: | docker run --rm --platform linux/${{ matrix.arch }} -v $PWD/example_project:/src -w /src -e TOXENV -e TOX_PARAMS="-p auto" fedorapython/fedora-python-tox:${{ matrix.arch }} - # Re-enable this test when switching from f40 to f41 - # - name: Test dnf install and wheel build - # env: - # TOXENV: ${{ matrix.toxenv }} - # run: | - # docker run --rm --platform linux/${{ matrix.arch }} -e DNF_INSTALL="libffi-devel 'pkgconfig(libgit2) >= 1.7' /usr/bin/cowsay" fedorapython/fedora-python-tox:${{ matrix.arch }} sh -c "/run_tests.sh; pip install -I --no-deps --compile --no-binary :all: cffi pygit2~=1.14.0 && cowsay DONE" + - name: Test dnf install and wheel build + env: + TOXENV: ${{ matrix.toxenv }} + run: | + docker run --rm --platform linux/${{ matrix.arch }} -e DNF_INSTALL="libffi-devel 'pkgconfig(libgit2) >= 1.7' /usr/bin/cowsay" fedorapython/fedora-python-tox:${{ matrix.arch }} sh -c "/run_tests.sh; pip install -I --no-deps --compile --no-binary :all: cffi pygit2~=1.14.0 && cowsay DONE" - name: Test external project with WORKDIR run: | docker run --rm --platform linux/${{ matrix.arch }} -e TOXENV=py3 -e GIT_URL=https://github.com/Netflix/nflxprofile.git -e WORKDIR=python fedorapython/fedora-python-tox:${{ matrix.arch }} From 70d742b87af056d080239727f1954c01260f39c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 May 2025 11:01:32 +0200 Subject: [PATCH 2/2] Update to Fedora 41 --- .github/workflows/build-and-push.yml | 6 +++--- Dockerfile | 4 ++-- README.md | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 50b84c0..afc3937 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -11,7 +11,7 @@ on: - cron: '48 23 * * 6' env: - FEDORA_VERSION: 40 + FEDORA_VERSION: 41 jobs: build-and-push: @@ -21,7 +21,7 @@ jobs: matrix: include: - arch: amd64 - toxenv: py27,py36,py38,py39,py310,py311,py312,py313,py314,pypy,pypy39,pypy310 + toxenv: py36,py38,py39,py310,py311,py312,py313,py314,pypy,pypy39,pypy310,pypy311 - arch: arm64 toxenv: py312 - arch: ppc64le @@ -63,7 +63,7 @@ jobs: env: TOXENV: ${{ matrix.toxenv }} run: | - docker run --rm --platform linux/${{ matrix.arch }} -e DNF_INSTALL="libffi-devel 'pkgconfig(libgit2) >= 1.7' /usr/bin/cowsay" fedorapython/fedora-python-tox:${{ matrix.arch }} sh -c "/run_tests.sh; pip install -I --no-deps --compile --no-binary :all: cffi pygit2~=1.14.0 && cowsay DONE" + docker run --rm --platform linux/${{ matrix.arch }} -e DNF_INSTALL="libffi-devel 'pkgconfig(libgit2) >= 1.9' /usr/bin/cowsay" fedorapython/fedora-python-tox:${{ matrix.arch }} sh -c "/run_tests.sh; pip install -I --no-deps --compile --no-binary :all: cffi pygit2~=1.17.0 && cowsay DONE" - name: Test external project with WORKDIR run: | docker run --rm --platform linux/${{ matrix.arch }} -e TOXENV=py3 -e GIT_URL=https://github.com/Netflix/nflxprofile.git -e WORKDIR=python fedorapython/fedora-python-tox:${{ matrix.arch }} diff --git a/Dockerfile b/Dockerfile index 2197e36..edb1232 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 LABEL maintainer="Lumír 'Frenzy' Balhar " @@ -10,7 +10,7 @@ RUN dnf update -y \ pypy2-devel \ pypy3.9-devel \ pypy3.10-devel \ - python2.7 \ + pypy3.11-devel \ python3.6 \ python3.8 \ python3.9 \ diff --git a/README.md b/README.md index 1ae5d3c..c0df18d 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ N goes EOL. # Installed packages On top of stable Fedora, this Docker image contains: -- Python 2.7, 3.6, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14 -- Pypy2, Pypy3.9 and Pypy3.10 +- Python 3.6, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14 +- Pypy2, Pypy3.9, Pypy3.10 and Pypy3.11 - python3-pip - gcc, gcc-c++, git-core and make - tox