diff --git a/.packit.yaml b/.packit.yaml index c3262646..283e1aa4 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -49,22 +49,6 @@ packages: - python3 setup.py sdist --dist-dir ./epel8/ - bash -c "ls -1t ./epel8/*.tar.gz | head -n 1" - specfile-epel10: - <<: *specfile - specfile_path: &specfile_path_epel10 epel10/python-specfile.spec - files_to_sync: - - *specfile_path_epel10 - - .packit.yaml - - src: plans/ - dest: plans/ - - src: .fmf/ - dest: .fmf/ - actions: - <<: *actions - create-archive: - - python3 setup.py sdist --dist-dir ./epel10/ - - bash -c "ls -1t ./epel10/*.tar.gz | head -n 1" - # docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs specfile-centos-integration-sig: <<: *specfile @@ -95,14 +79,11 @@ jobs: - fedora-all - fedora-all-aarch64 - epel-9 + - epel-10-all - <<: *copr_build_pr packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_pr - packages: [specfile-epel10] - targets: - - epel-10-all - &copr_build_commit_main job: copr_build @@ -113,6 +94,7 @@ jobs: - fedora-all - fedora-all-aarch64 - epel-9 + - epel-10-all project: packit-dev list_on_homepage: True preserve_project: True @@ -120,10 +102,6 @@ jobs: packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_commit_main - packages: [specfile-epel10] - targets: - - epel-10-all - &copr_build_commit_stable job: copr_build @@ -145,6 +123,7 @@ jobs: - fedora-all - fedora-all-aarch64 - epel-9 + - epel-10-all project: packit-releases list_on_homepage: True preserve_project: True @@ -152,10 +131,6 @@ jobs: packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_release - packages: [specfile-epel10] - targets: - - epel-10-all - &tests job: tests @@ -165,6 +140,7 @@ jobs: targets: - fedora-all - epel-9 + - epel-10-all - <<: *tests identifier: performance tmt_plan: performance @@ -186,11 +162,6 @@ jobs: set -x dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm %end - - <<: *tests - packages: [specfile-epel10] - tmt_plan: "smoke|full" - targets: - - epel-10-all - &propose_downstream job: propose_downstream @@ -202,16 +173,13 @@ jobs: - fedora-branched - eln epel-9: {} + epel-10: + fast_forward_merge_into: + - epel-10-branched - <<: *propose_downstream packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *propose_downstream - packages: [specfile-epel10] - dist_git_branches: - epel-10: - fast_forward_merge_into: - - epel-10-branched - <<: *propose_downstream packages: [specfile-centos-integration-sig] dist_git_branches: @@ -227,16 +195,13 @@ jobs: - fedora-branched - eln epel-9: {} + epel-10: + fast_forward_merge_into: + - epel-10-branched - <<: *pull_from_upstream packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *pull_from_upstream - packages: [specfile-epel10] - dist_git_branches: - epel-10: - fast_forward_merge_into: - - epel-10-branched - <<: *pull_from_upstream packages: [specfile-centos-integration-sig] dist_git_branches: @@ -254,10 +219,6 @@ jobs: packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *koji_build - packages: [specfile-epel10] - dist_git_branches: - - epel-10-all - <<: *koji_build packages: [specfile-centos-integration-sig] dist_git_branches: @@ -268,6 +229,7 @@ jobs: - packit dist_git_branches: - fedora-all + - epel-10-all - &bodhi_update job: bodhi_update @@ -281,7 +243,3 @@ jobs: packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *bodhi_update - packages: [specfile-epel10] - dist_git_branches: - - epel-10-all diff --git a/epel10/python-specfile.spec b/epel10/python-specfile.spec deleted file mode 100644 index ba74e88a..00000000 --- a/epel10/python-specfile.spec +++ /dev/null @@ -1,280 +0,0 @@ -%bcond_with tests - - -%global desc %{expand: -Python library for parsing and manipulating RPM spec files. -Main focus is on modifying existing spec files, any change should result -in a minimal diff.} - - -%global base_version 0.39.1 -#global prerelease rc1 - -%global package_version %{base_version}%{?prerelease:~%{prerelease}} -%global pypi_version %{base_version}%{?prerelease} - - -Name: python-specfile -Version: %{package_version} -Release: 1%{?dist} - -Summary: A library for parsing and manipulating RPM spec files -License: MIT -URL: https://github.com/packit/specfile - -Source0: %{pypi_source specfile %{pypi_version}} - -BuildArch: noarch - -BuildRequires: python3-devel -%if %{with tests} -# tests/unit/test_guess_packager.py -BuildRequires: git-core -%endif - -# system-rpm-config pulls in packages containing SRPM macros -# necessary for spec file preprocessing and parsing -Recommends: system-rpm-config - - -%description -%{desc} - - -%package -n python%{python3_pkgversion}-specfile -Summary: %{summary} - - -%description -n python%{python3_pkgversion}-specfile -%{desc} - - -%prep -%autosetup -p1 -n specfile-%{pypi_version} - -# since we are building from PyPI source, we don't need git-archive -# support in setuptools_scm -sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml - - -%generate_buildrequires -%pyproject_buildrequires %{?with_tests: -x testing} - - -%build -%pyproject_wheel - - -%install -%pyproject_install -%pyproject_save_files specfile - - -%if %{with tests} -%check -%pytest --verbose tests/unit tests/integration -%endif - - -%files -n python%{python3_pkgversion}-specfile -f %{pyproject_files} -%doc README.md - - -%changelog -* Sat Feb 14 2026 Packit Team - 0.39.1-1 -- New upstream release 0.39.1 - -* Thu Feb 12 2026 Packit Team - 0.39.0-1 -- New upstream release 0.39.0 - -* Thu Jan 08 2026 Packit Team - 0.38.0-1 -- New upstream release 0.38.0 - -* Fri Oct 03 2025 Packit Team - 0.37.1-1 -- New upstream release 0.37.1 - -* Fri Sep 05 2025 Packit Team - 0.37.0-1 -- New upstream release 0.37.0 - -* Fri May 30 2025 Packit Team - 0.36.0-1 -- New upstream release 0.36.0 - -* Fri May 16 2025 Packit Team - 0.35.1-1 -- New upstream release 0.35.1 - -* Sun Apr 13 2025 Packit Team - 0.35.0-1 -- New upstream release 0.35.0 - -* Fri Mar 14 2025 Packit Team - 0.34.2-1 -- New upstream release 0.34.2 - -* Fri Feb 07 2025 Packit Team - 0.34.1-1 -- New upstream release 0.34.1 - -* Sun Jan 26 2025 Packit Team - 0.34.0-1 -- New upstream release 0.34.0 - -* Fri Dec 13 2024 Packit Team - 0.33.0-1 -- New upstream release 0.33.0 - -* Wed Nov 13 2024 Packit Team - 0.32.6-1 -- New upstream release 0.32.6 - -* Fri Oct 25 2024 Packit Team - 0.32.5-1 -- New upstream release 0.32.5 - -* Fri Oct 11 2024 Packit Team - 0.32.4-1 -- New upstream release 0.32.4 - -* Fri Sep 27 2024 Packit Team - 0.32.3-1 -- New upstream release 0.32.3 - -* Fri Sep 13 2024 Packit Team - 0.32.2-1 -- New upstream release 0.32.2 - -* Mon Jul 29 2024 Packit Team - 0.32.1-1 -- New upstream release 0.32.1 - -* Mon Jul 22 2024 Packit Team - 0.32.0-1 -- New upstream release 0.32.0 - -* Thu Jul 04 2024 Packit Team - 0.31.0-1 -- New upstream release 0.31.0 - -* Wed Jun 26 2024 Packit Team - 0.30.0-1 -- New upstream release 0.30.0 - -* Thu Jun 06 2024 Packit Team - 0.29.0-1 -- New upstream release 0.29.0 - -* Thu May 23 2024 Packit Team - 0.28.3-1 -- New upstream release 0.28.3 - -* Mon Apr 08 2024 Packit Team - 0.28.2-1 -- New upstream release 0.28.2 - -* Mon Mar 25 2024 Packit Team - 0.28.1-1 -- New upstream release 0.28.1 - -* Sun Mar 17 2024 Packit Team - 0.28.0-1 -- New upstream release 0.28.0 - -* Fri Jan 19 2024 Packit Team - 0.27.0-1 -- New upstream release 0.27.0 - -* Fri Dec 08 2023 Packit Team - 0.26.0-1 -- New upstream release 0.26.0 - -* Mon Nov 20 2023 Packit Team - 0.25.1~rc1-1 -- New upstream release 0.25.1rc1 - -* Mon Nov 20 2023 Packit Team - 0.25.0-1 -- New upstream release 0.25.0 - -* Tue Nov 14 2023 Nikola Forró - 0.24.1~rc2-1 -- New upstream release 0.24.1rc2 - -* Tue Nov 14 2023 Nikola Forró - 0.24.1~rc1-1 -- New upstream release 0.24.1-rc1 - -* Mon Nov 06 2023 Packit Team - 0.24.0-1 -- New upstream release 0.24.0 - -* Sun Oct 29 2023 Packit Team - 0.23.0-1 -- New upstream release 0.23.0 - -* Fri Oct 06 2023 Packit Team - 0.22.1-1 -- New upstream release 0.22.1 - -* Fri Sep 01 2023 Packit Team - 0.22.0-1 -- New upstream release 0.22.0 - -* Fri Aug 11 2023 Packit Team - 0.21.0-1 -- New upstream release 0.21.0 - -* Fri Aug 04 2023 Tomas Tomecek - 0.20.2-2 -- Confirm License is SPDX compatible. - -* Mon Jul 31 2023 Packit Team - 0.20.2-1 -- New upstream release 0.20.2 - -* Sun Jul 30 2023 Packit Team - 0.20.1-1 -- New upstream release 0.20.1 - -* Thu Jul 13 2023 Packit Team - 0.20.0-1 -- New upstream release 0.20.0 - -* Thu Jun 22 2023 Packit Team - 0.19.0-1 -- New upstream release 0.19.0 - -* Fri May 26 2023 Packit Team - 0.18.0-1 -- New upstream release 0.18.0 - -* Thu May 11 2023 Packit Team - 0.17.0-1 -- New upstream release 0.17.0 - -* Thu Apr 20 2023 Packit Team - 0.16.0-1 -- New upstream release 0.16.0 - -* Fri Mar 10 2023 Packit Team - 0.15.0-1 -- New upstream release 0.15.0 - -* Thu Feb 23 2023 Packit Team - 0.14.0-1 -- New upstream release 0.14.0 - -* Mon Jan 30 2023 Packit Team - 0.13.2-1 -- New upstream release 0.13.2 - -* Mon Jan 23 2023 Packit Team - 0.13.1-1 -- New upstream release 0.13.1 - -* Fri Jan 20 2023 Packit Team - 0.13.0-1 -- New upstream release 0.13.0 - -* Fri Jan 06 2023 Packit Team - 0.12.0-1 -- New upstream release 0.12.0 - -* Wed Dec 14 2022 Packit Team - 0.11.1-1 -- New upstream release 0.11.1 - -* Fri Dec 09 2022 Packit Team - 0.11.0-1 -- New upstream release 0.11.0 - -* Sat Nov 26 2022 Packit Team - 0.10.0-1 -- New upstream release 0.10.0 - -* Fri Nov 11 2022 Packit Team - 0.9.1-1 -- New upstream release 0.9.1 - -* Tue Oct 25 2022 Packit Team - 0.9.0-1 -- New upstream release 0.9.0 - -* Fri Oct 14 2022 Packit Team - 0.8.0-1 -- New upstream release 0.8.0 - -* Fri Oct 07 2022 Packit Team - 0.7.0-1 -- New upstream release 0.7.0 - -* Thu Aug 25 2022 Nikola Forró - 0.6.0-1 -- New upstream release 0.6.0 - -* Tue Aug 09 2022 Nikola Forró - 0.5.1-1 -- New upstream release 0.5.1 - -* Thu Jul 21 2022 Nikola Forró - 0.5.0-1 -- New upstream release 0.5.0 - -* Thu Jun 16 2022 Nikola Forró - 0.4.0-1 -- New upstream release 0.4.0 - -* Tue May 10 2022 Nikola Forró - 0.3.0-1 -- New upstream release 0.3.0 - -* Wed Mar 30 2022 Nikola Forró - 0.2.0-1 -- New upstream release 0.2.0 - -* Mon Feb 21 2022 Nikola Forró - 0.1.1-1 -- New upstream release 0.1.1 - -* Tue Feb 08 2022 Nikola Forró - 0.1.0-1 -- Initial package diff --git a/plans/full.fmf b/plans/full.fmf index dc008418..4ed13166 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -8,11 +8,3 @@ adjust: prepare+: - how: install package: python3 - - - when: "distro == rhel-10 or distro == centos-10 or distro == centos-stream-10" - because: "flexmock is not in EPEL 10: https://bugzilla.redhat.com/show_bug.cgi?id=2351835" - prepare+: - - how: install - package: python3-pip - - how: shell - script: pip3 install flexmock diff --git a/tests/full.fmf b/tests/full.fmf index ccd481fe..dfd2fb01 100644 --- a/tests/full.fmf +++ b/tests/full.fmf @@ -6,11 +6,6 @@ require: - python3-pytest - python3-pytest-cov - python3-specfile -adjust: - - when: "distro == rhel-10 or distro == centos-10 or distro == centos-stream-10" - because: "flexmock is not in EPEL 10: https://bugzilla.redhat.com/show_bug.cgi?id=2351835" - require-: - - python3-flexmock tag: - basic tier: 1