diff --git a/.gitignore b/.gitignore index 73f6a60..cb2aca8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /specfile-0.7.0.tar.gz /specfile-0.20.2.tar.gz /specfile-0.21.0.tar.gz +/specfile-0.22.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml index 060174c..1a4f6a8 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -124,15 +124,25 @@ jobs: - job: tests trigger: pull_request packages: [specfile] + tmt_plan: "smoke|full|packit-integration" targets: - fedora-all - epel-9 - job: tests trigger: pull_request packages: [specfile-epel8] + tmt_plan: "smoke|full" targets: - epel-8 + - job: tests + trigger: pull_request + packages: [specfile] + identifier: performance + tmt_plan: performance + targets: + - fedora-rawhide + - job: propose_downstream trigger: release packages: [specfile] diff --git a/README.packit b/README.packit index 1bb774e..21ea346 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.69.0.post78+g1d260fb.d20230418. +The file was generated using packit 0.82.0.post1.dev20+g6670daea. diff --git a/plans/full.fmf b/plans/full.fmf index 0b0a12f..36b58ec 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -2,11 +2,3 @@ summary: Unit & integration tests discover+: filter: tier:1 -adjust: - - when: "distro == rhel-9 or distro == centos-9 or distro == centos-stream-9" - because: "flexmock is not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251" - prepare: - - how: install - package: python3-pip - - how: shell - script: pip3 install flexmock diff --git a/plans/main.fmf b/plans/main.fmf index 87402eb..8a9e14c 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: 56360c0a80b102065e71ccee587b155dfc83317e + ref: 0af08c92db46a042cff83d7e4647be398dba843e execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index f901d66..24734e8 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tier:0 | tier:1 - ref: 804c96beeb46dbb0ef209e545bd46735809628a0 + ref: 7581995d78074a7a5bbd87b1fab410a40d18f8ed prepare: - how: install copr: packit/packit-dev @@ -16,12 +16,12 @@ adjust: how: install directory: noarch/ - when: distro == rhel-9 or distro == centos-9 or distro == centos-stream-9 - because: 'flexmock and deepdiff are not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251' + because: 'build and deepdiff are not in EPEL 9: https://bugzilla.redhat.com/show_bug.cgi?id=2120251' prepare+: - how: install package: python3-pip - how: shell - script: pip3 install flexmock deepdiff + script: pip3 install build deepdiff - when: distro == rhel-8 or distro == centos-8 or distro == centos-stream-8 because: packit doesn't support EL 8 enabled: false diff --git a/plans/performance.fmf b/plans/performance.fmf new file mode 100644 index 0000000..bf8bf53 --- /dev/null +++ b/plans/performance.fmf @@ -0,0 +1,11 @@ +summary: + Performance tests +discover+: + filter: tier:3 +prepare: + - how: install + package: python3-pip + - how: shell + script: pip3 install pytest-fail-slow + - how: shell + script: curl --output-dir /tmp -O https://src.fedoraproject.org/rpms/texlive/raw/rawhide/f/texlive.spec diff --git a/python-specfile.spec b/python-specfile.spec index a5f6c2d..259d73e 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -5,7 +5,7 @@ in a minimal diff.} Name: python-specfile -Version: 0.21.0 +Version: 0.22.1 Release: 1%{?dist} Summary: A library for parsing and manipulating RPM spec files @@ -17,7 +17,7 @@ Source0: %{pypi_source specfile} BuildArch: noarch BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: %{py3_dist setuptools setuptools-scm setuptools-scm-git-archive} +BuildRequires: %{py3_dist setuptools setuptools-scm} BuildRequires: %{py3_dist importlib-metadata dataclasses rpm typing-extensions} BuildRequires: %{py3_dist flexmock pytest} BuildRequires: git-core @@ -37,8 +37,6 @@ Summary: %{summary} %prep %autosetup -p1 -n specfile-%{version} -# Use packaged RPM python bindings downstream -sed -i 's/rpm-py-installer/rpm/' setup.cfg # Remove bundled egg-info rm -rf specfile.egg-info @@ -52,7 +50,7 @@ rm -rf specfile.egg-info %check -%pytest +%pytest --verbose tests/unit tests/integration %files -n python%{python3_pkgversion}-specfile @@ -63,6 +61,9 @@ rm -rf specfile.egg-info %changelog +* Fri Oct 06 2023 Packit - 0.22.1-1 +- Removed dependency on setuptools-scm-git-archive. (#290) + * Fri Aug 11 2023 Nikola Forró - 0.21.0-1 - `specfile` no longer tracebacks when some sources are missing and can't be _emulated_. In such case the spec file is parsed without them at the cost of `%%setup` and `%%patch` macros potentially expanding differently than with the sources present. (#271) - Specfile's license in RPM spec file is now confirmed to be SPDX compatible. (#269) diff --git a/sources b/sources index 0540e27..9b9a431 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.21.0.tar.gz) = 9860109203c69a586ce3759c983c550ae150aaed9744cf7db740c9bce2e11e5192b0153f923f584d8f8b526d61dca08b308519913c7aa5587e7a09e92487426a +SHA512 (specfile-0.22.1.tar.gz) = 5ca758b923e121ce37003967b538d97e72fca607e63e500a4126da960d210e1ebd897faa0cd446f7f346caab6eca4d899c6190e5c20322047374ca677e925458