Skip to content

Commit b3b955e

Browse files
authored
ci: Synchronize with Fedora downstream (#884)
- scikit-build-core is now built in epel-10 with all the tests enabled :tada: - Removed the `[pyproject]` extra - Removed the `rpmlint` test - Minor maintenance to `.packit.yaml` --------- Signed-off-by: Cristian Le <[email protected]> Signed-off-by: Cristian Le <[email protected]>
1 parent 7568be0 commit b3b955e

File tree

4 files changed

+21
-59
lines changed

4 files changed

+21
-59
lines changed

.distro/plans/rpmlint.fmf

-10
This file was deleted.

.distro/python-scikit-build-core.rpmlintrc

-3
This file was deleted.

.distro/python-scikit-build-core.spec

+4-34
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
# Testing dependencies not satisfied on epel
2-
# build, cattrs, hatch-fancy-pypi-readme, pytest-subprocess
3-
%if 0%{?el10}
4-
%bcond_with tests
5-
%else
6-
%bcond_without tests
7-
%endif
8-
91
%global debug_package %{nil}
102

113
Name: python-scikit-build-core
@@ -37,32 +29,12 @@ A next generation Python CMake adapter and Python API for plugins
3729
%package -n python3-scikit-build-core
3830
Summary: %{summary}
3931
Requires: cmake
40-
Recommends: (ninja-build or make)
41-
Recommends: python3-scikit-build-core+pyproject = %{version}-%{release}
42-
Suggests: ninja-build
43-
Suggests: gcc
44-
Provides: bundled(python3dist(pyproject-metadata))
32+
Requires: ninja-build
4533
BuildArch: noarch
46-
%description -n python3-scikit-build-core %_description
47-
4834

49-
# Add %%pyproject_extras_subpkg results manually because BuildArch: noarch is not injected
50-
# https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/174
51-
# %%pyproject_extras_subpkg -n python3-scikit-build-core pyproject
35+
Obsoletes: python3-scikit-build-core+pyproject < 0.10.7-3
5236

53-
%package -n python3-scikit-build-core+pyproject
54-
Summary: Metapackage for python3-scikit-build-core: pyproject extras
55-
Requires: python3-scikit-build-core = %{?epoch:%{epoch}:}%{version}-%{release}
56-
BuildArch: noarch
57-
# Deprecated empty extras package
58-
# Note: Cannot use Obsoletes + Provides here. python3dist() does not seem to be picked up
59-
Provides: deprecated()
60-
%description -n python3-scikit-build-core+pyproject
61-
This is a metapackage bringing in pyproject extras requires for
62-
python3-scikit-build-core.
63-
It makes sure the dependencies are installed.
64-
65-
%files -n python3-scikit-build-core+pyproject -f %{_pyproject_ghost_distinfo}
37+
%description -n python3-scikit-build-core %_description
6638

6739

6840
%prep
@@ -72,7 +44,7 @@ cp -p src/scikit_build_core/_vendor/pyproject_metadata/LICENSE LICENSE-pyproject
7244

7345

7446
%generate_buildrequires
75-
%pyproject_buildrequires %{?with_tests:-x test,test-meta,test-numpy}
47+
%pyproject_buildrequires -x test,test-meta,test-numpy
7648

7749

7850
%build
@@ -86,10 +58,8 @@ cp -p src/scikit_build_core/_vendor/pyproject_metadata/LICENSE LICENSE-pyproject
8658

8759
%check
8860
%pyproject_check_import
89-
%if %{with tests}
9061
%pytest \
9162
-m "not network"
92-
%endif
9363

9464

9565
%files -n python3-scikit-build-core -f %{pyproject_files}

.packit.yaml

+17-12
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ files_to_sync:
66
- "protect .git*"
77
- "protect sources"
88
- "protect changelog"
9-
- "- plans/rpmlint.fmf"
9+
- "protect gating.yaml"
1010
- .packit.yaml
1111

1212
upstream_package_name: scikit-build-core
@@ -20,31 +20,36 @@ targets: &targets
2020
- epel-10-x86_64
2121
- epel-10-aarch64
2222

23-
jobs:
24-
- &copr_build
23+
_:
24+
# Job templates
25+
- &build-in-packit
2526
job: copr_build
26-
trigger: pull_request
27+
- &build-in-scikit-build
28+
<<: *build-in-packit
29+
owner: "@scikit-build"
2730
- &tests
2831
job: tests
29-
trigger: pull_request
3032
fmf_path: .distro
31-
targets:
32-
- fedora-all-x86_64
33-
- fedora-all-aarch64
34-
- <<: *copr_build
33+
34+
jobs:
35+
# Upstream jobs
36+
- <<: *build-in-scikit-build
3537
trigger: release
36-
owner: "@scikit-build"
3738
project: release
3839
- <<: *tests
3940
trigger: release
40-
- <<: *copr_build
41+
- <<: *build-in-scikit-build
4142
trigger: commit
4243
branch: main
43-
owner: "@scikit-build"
4444
project: nightly
4545
- <<: *tests
4646
trigger: commit
4747
branch: main
48+
- <<: *build-in-packit
49+
trigger: pull_request
50+
- <<: *tests
51+
trigger: pull_request
52+
# Downstream jobs
4853
- job: propose_downstream
4954
trigger: release
5055
dist_git_branches:

0 commit comments

Comments
 (0)