diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/plan.fmf b/plan.fmf deleted file mode 100644 index d2c549f..0000000 --- a/plan.fmf +++ /dev/null @@ -1,45 +0,0 @@ -execute: - how: tmt - -discover: - - name: same_repo - how: shell - dist-git-source: true - dist-git-download-only: true - tests: - - name: pythonabi - path: /tests - test: ./pythonabi.sh - - name: pythonname - path: /tests - test: ./pythonname.sh - - name: pythondist - path: /tests - test: ./pythondist.sh - - name: console_script - path: /tests - test: ./console_script.sh - - name: pytest - test: cd $TMT_SOURCE_DIR && ./tests/download_data_and_run_pytest.sh - -prepare: - - name: Install dependencies - how: install - package: - - rpm-build - - rpmdevtools - - fedpkg-minimal - - python3-devel - - python3-pip - - python3-pytest - - python3-pyyaml - - python3-setuptools - - python3-wheel - - dnf - - name: Update packages - how: shell - script: dnf upgrade -y - - name: rpm_qa - order: 100 - how: shell - script: rpm -qa | sort | tee $TMT_PLAN_DATA/rpmqa.txt diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec index 599eb0c..d014a53 100644 --- a/python-rpm-generators.spec +++ b/python-rpm-generators.spec @@ -1,7 +1,7 @@ Name: python-rpm-generators Summary: Dependency generators for Python RPMs Version: 14 -Release: 13%{?dist} +Release: 11%{?dist} Url: https://src.fedoraproject.org/rpms/python-rpm-generators @@ -56,12 +56,6 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} *.py %{_rpmconfigdir}/pythonbundles.py %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 14-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 14-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Fri Jul 19 2024 Fedora Release Engineering - 14-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/tests/download_data_and_run_pytest.sh b/tests/download_data_and_run_pytest.sh index 79d54b5..8dca398 100755 --- a/tests/download_data_and_run_pytest.sh +++ b/tests/download_data_and_run_pytest.sh @@ -4,11 +4,10 @@ # When the tests run in python-rpm-generators, # the structure on disk does not match the dist-git repository. # We apparently must use the standard-test-source role to grab the sources. -# OTOH in other packages, we must use fedpkg(-minimal) or centpkg(-minimal), -# depending on the destination OS. -# The --force flag is required in full-blown fedpkg/centpkg (the source is unused in spec), -# and it is ignored in fedpkg/centpkg-minimal (all sources are always downloaded). -test -f test-sources-*.tar.gz || fedpkg sources --force || centpkg sources --force +# OTOH in other packages, we must use fedpkg(-minimal). +# The --force flag is required in full-blown fedpkg (the source is unused in spec), +# and it is ignored in fedpkg-minimal (all sources are always downloaded). +test -f test-sources-*.tar.gz || fedpkg sources --force tar -xvf test-sources-*.tar.gz -C ./tests/data/scripts_pythondistdeps/ cd tests/ diff --git a/tests/pythonname.sh b/tests/pythonname.sh index f737a1f..b21058c 100755 --- a/tests/pythonname.sh +++ b/tests/pythonname.sh @@ -43,7 +43,7 @@ test $(rpm -qp --obsoletes ${RPMDIR}/python${X_Y}-foo-0-0.noarch.rpm | wc -l) -e echo "Obsoletes for python3-foo" rpm -qp --obsoletes ${RPMDIR}/python3-foo-0-0.noarch.rpm # In ELN/RHEL the pythonX.Y-* Obsoletes is generated, but not in Fedora, so we check for it explicitly. -rpm -qp --obsoletes ${RPMDIR}/python3-foo-0-0.noarch.rpm | grep -q '^python'${X_Y}'-foo < 0-0$' && exit 1 || true +rpm -qp --obsoletes ${RPMDIR}/python3-foo-0-0.noarch.rpm | grep -q '^python'${X_Y}'-py_provides < 0-0$' && exit 1 || true test $(rpm -qp --obsoletes ${RPMDIR}/python3-foo-0-0.noarch.rpm | wc -l) -eq 0 echo "Obsoletes for python2-foo" diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..22b2cb7 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,48 @@ +--- +- hosts: localhost + tags: + - classic + tasks: + - dnf: + name: "*" + state: latest + +- hosts: localhost + tags: + - classic + pre_tasks: + - import_role: + name: standard-test-source + vars: + fetch_only: True + roles: + - role: standard-test-basic + tests: + - rpm_qa: + dir: . + run: rpm -qa | sort + - pythonabi: + dir: . + run: ./pythonabi.sh + - pythonname: + dir: . + run: ./pythonname.sh + - pythondist: + dir: . + run: ./pythondist.sh + - console_script: + dir: . + run: ./console_script.sh + - pytest: + dir: . + run: ./download_data_and_run_pytest.sh + required_packages: + - rpm-build + - rpmdevtools + - fedpkg-minimal + - python3-devel + - python3-pip + - python3-pytest + - python3-pyyaml + - python3-setuptools + - python3-wheel