From f20db6945ae28becb23fdbe501d2e52db3f26372 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 12 Nov 2024 12:25:43 +0100 Subject: [PATCH 1/8] Run a smoke test on CI Unify the test suite between Fedora and CentOS Stream. This has been cherry-picked from c10s branch. --- tests/smoke/runtest.sh | 13 +++++++++++++ tests/tests.yml | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 tests/smoke/runtest.sh diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100644 index 0000000..d0e4f06 --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -eux + +# Currently there is no easy way to see the versions of installed packages. +# Let's list them to make sure we're testing against the correct package set. +rpm -qa | sort +python3 -c 'import packaging' +python3 -c 'from packaging import version; version.Version("2.5.1rc2")' +python3 -c 'from packaging import specifiers; specifiers.SpecifierSet("~=1.0")' +python3 -c 'from packaging import markers; markers.Marker("python_version>'"'"'2'"'"'")' +python3 -c 'from packaging import requirements; requirements.Requirement('"'"'name[foo]>=2,<3; python_version>"2.0"'"'"')' +python3 -c 'from packaging import tags; tags.Tag("py39", "none", "any")' +python3 -c 'from packaging.utils import canonicalize_name; canonicalize_name("Django_foobar")' diff --git a/tests/tests.yml b/tests/tests.yml index c89a956..a403286 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,6 +25,9 @@ - rpm_generators_unit_tests: dir: python-rpm-generators run: ./tests/download_data_and_run_pytest.sh + - smoke: + dir: . + run: ./smoke/runtest.sh required_packages: - fedpkg-minimal - mock From 177dbd914ca7088d38f2e3ac26792ffb69a585d4 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sun, 20 Apr 2025 20:26:22 +0200 Subject: [PATCH 2/8] Update to 25.0 (rhbz#2361114) --- .gitignore | 1 + python-packaging.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a32df9f..12c5076 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /packaging-24.0.tar.gz /packaging-24.1.tar.gz /packaging-24.2.tar.gz +/packaging-25.0.tar.gz diff --git a/python-packaging.spec b/python-packaging.spec index 49c22f4..3ccae48 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -21,7 +21,7 @@ %endif Name: python-%{pypi_name} -Version: 24.2 +Version: 25.0 Release: %autorelease Summary: Core utilities for Python packages diff --git a/sources b/sources index 0b9396f..b75606d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (packaging-24.2.tar.gz) = cab6be7284c6bc2abce7a5bbdc25a40e33378576c5590dad4aef9d835a2205af81ca24af7ae3603d0e4e32f8865d87a621187dae2f86df6ac613c9886d482804 +SHA512 (packaging-25.0.tar.gz) = fb8419f81f0f817440c0b297fc6e963832e219e7a324bf4e0321f1e131a4822f17a19f2eb033a8d4adb622ccb16db59776ec44906a0c0b34f2877b59b9558c18 From 1d5255c3b74a90bb944718f6c1f13f2ffa22d89c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 11:22:42 +0200 Subject: [PATCH 3/8] Bootstrap for Python 3.14 --- python-packaging.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-packaging.spec b/python-packaging.spec index 3ccae48..6f117ab 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,3 +1,4 @@ +%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode From 4f8ffba24fd567d1d4e0dbbf91b66359ed283699 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 11:30:32 +0200 Subject: [PATCH 4/8] Rebuilt for Python 3.14 --- python-packaging.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-packaging.spec b/python-packaging.spec index 6f117ab..3ccae48 100644 --- a/python-packaging.spec +++ b/python-packaging.spec @@ -1,4 +1,3 @@ -%global _with_bootstrap 1 %global pypi_name packaging # Specify --with bootstrap to build in bootstrap mode From 6fcf0545b171b2627731a0b0a4f045f0c1aa001c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 09:13:37 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5826dff7bbe1f6c2403675bf544376dabfc5f8be Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 14:19:05 +0200 Subject: [PATCH 6/8] Rebuilt for Python 3.14.0rc2 bytecode From 38746eb07fc3e3df1920f777a03b9a4b1ee729b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Fri, 25 Jul 2025 14:55:26 +0200 Subject: [PATCH 7/8] CI: Drop STI and use tmt instead Resolves: rhbz#2383038 --- .fmf/version | 1 + plan.fmf | 51 ++++++++++++++++++++++++++++++++++++++++++ tests/smoke/runtest.sh | 0 tests/tests.yml | 40 --------------------------------- 4 files changed, 52 insertions(+), 40 deletions(-) create mode 100644 .fmf/version create mode 100644 plan.fmf mode change 100644 => 100755 tests/smoke/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..bd248b6 --- /dev/null +++ b/plan.fmf @@ -0,0 +1,51 @@ +execute: + how: tmt + +discover: + - name: same_repo + how: shell + tests: + - name: smoke + test: ./smoke/runtest.sh + path: /tests + - name: rpms_pyproject-rpm-macros + how: shell + url: https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git + tests: + - name: pyproject_pytest + path: /tests + test: ./mocktest.sh python-pytest + - name: pyproject_entrypoints + path: /tests + test: ./mocktest.sh python-entrypoints + - name: pyproject_pluggy + path: /tests + test: ./mocktest.sh python-pluggy + - name: pyproject_clikit + path: /tests + test: ./mocktest.sh python-clikit + - name: rpms_python-rpm-generators + how: shell + test: | + # Need to clone on our own, tmt clones it into 'tests' subdirectory + # which breaks fedpkg-minimal pkgname detection + git clone --depth=1 https://src.fedoraproject.org/rpms/python-rpm-generators.git python-rpm-generators && + cd python-rpm-generators && + ./tests/download_data_and_run_pytest.sh +prepare: + - name: Install dependencies + how: install + package: + - fedpkg-minimal + - mock + - python3-pip + - python3-pytest + - python3-pyyaml + - python3-setuptools + - python3-wheel + - rpmdevtools + - rpm-build + - dnf + - name: Update packages + how: shell + script: dnf upgrade -y diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh old mode 100644 new mode 100755 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index a403286..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - repositories: - - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git" - dest: "pyproject-rpm-macros" - - repo: "https://src.fedoraproject.org/rpms/python-rpm-generators.git" - dest: "python-rpm-generators" - tests: - - pyproject_pytest: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-pytest - - pyproject_entrypoints: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-entrypoints - - pyproject_pluggy: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-pluggy - - pyproject_clikit: - dir: pyproject-rpm-macros/tests - run: ./mocktest.sh python-clikit - - rpm_generators_unit_tests: - dir: python-rpm-generators - run: ./tests/download_data_and_run_pytest.sh - - smoke: - dir: . - run: ./smoke/runtest.sh - required_packages: - - fedpkg-minimal - - mock - - python3-pip - - python3-pytest - - python3-pyyaml - - python3-setuptools - - python3-wheel - - rpmdevtools - - rpm-build From efb6ac5714056740a6cccaf214b439063fa70e3f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 13:55:23 +0200 Subject: [PATCH 8/8] Rebuilt for Python 3.14.0rc3 bytecode