diff --git a/.distro/plans/examples.fmf b/.distro/plans/examples.fmf index d6f691350..96d0d5528 100644 --- a/.distro/plans/examples.fmf +++ b/.distro/plans/examples.fmf @@ -1,5 +1,4 @@ -summary: - Documentation examples +summary: Documentation examples discover+: how: fmf filter: "tag: examples" diff --git a/.distro/plans/smoke.fmf b/.distro/plans/smoke.fmf index 57874e55e..5de047e6f 100644 --- a/.distro/plans/smoke.fmf +++ b/.distro/plans/smoke.fmf @@ -1,5 +1,7 @@ -summary: - Basic smoke tests +/: + inherit: false + +summary: Basic smoke tests discover: how: fmf filter: "tag: smoke" diff --git a/.distro/tests/smoke.fmf b/.distro/tests/smoke.fmf index 32359ea15..a5f558edd 100644 --- a/.distro/tests/smoke.fmf +++ b/.distro/tests/smoke.fmf @@ -5,4 +5,5 @@ path: / # Define tests /version: + summary: Read version test: python3 -c "import scikit_build_core; print(scikit_build_core.__version__)" diff --git a/docs/examples/downstream/nanobind_example/main.fmf b/docs/examples/downstream/nanobind_example/main.fmf index 870767564..7365fa7f2 100644 --- a/docs/examples/downstream/nanobind_example/main.fmf +++ b/docs/examples/downstream/nanobind_example/main.fmf @@ -1,7 +1,6 @@ -summary: - Nanobind downstream example +summary: Nanobind downstream example adjust: enabled: false because: Nanobind is not yet packaged on Fedora #require+: -# - python3-nanobind +# - python3dist(nanobind) diff --git a/docs/examples/downstream/pybind11_example/main.fmf b/docs/examples/downstream/pybind11_example/main.fmf index a15376690..f0732e320 100644 --- a/docs/examples/downstream/pybind11_example/main.fmf +++ b/docs/examples/downstream/pybind11_example/main.fmf @@ -1,5 +1,4 @@ -summary: - Pybind downstream example +summary: Pybind downstream example require+: - gcc-c++ - - pybind11-devel + - python3dist(pybind11) diff --git a/docs/examples/getting_started/abi3/main.fmf b/docs/examples/getting_started/abi3/main.fmf index 2f802f463..70d87b706 100644 --- a/docs/examples/getting_started/abi3/main.fmf +++ b/docs/examples/getting_started/abi3/main.fmf @@ -1,2 +1 @@ -summary: - Abi3 example project +summary: Abi3 example project diff --git a/docs/examples/getting_started/c/main.fmf b/docs/examples/getting_started/c/main.fmf index 29dfa4f53..70765c17b 100644 --- a/docs/examples/getting_started/c/main.fmf +++ b/docs/examples/getting_started/c/main.fmf @@ -1,2 +1 @@ -summary: - C example project +summary: C example project diff --git a/docs/examples/getting_started/cython/main.fmf b/docs/examples/getting_started/cython/main.fmf index 5c45fc9ee..4c81569be 100644 --- a/docs/examples/getting_started/cython/main.fmf +++ b/docs/examples/getting_started/cython/main.fmf @@ -1,4 +1,3 @@ -summary: - Cython example project +summary: Cython example project require+: - - python3-cython + - python3dist(cython) diff --git a/docs/examples/getting_started/fortran/main.fmf b/docs/examples/getting_started/fortran/main.fmf index 4ee34e63f..0bf94bfcc 100644 --- a/docs/examples/getting_started/fortran/main.fmf +++ b/docs/examples/getting_started/fortran/main.fmf @@ -1,6 +1,5 @@ -summary: - F2PY example project +summary: F2PY example project require+: - gcc-gfortran - - python3-numpy + - python3dist(numpy) - python3-numpy-f2py diff --git a/docs/examples/getting_started/nanobind/main.fmf b/docs/examples/getting_started/nanobind/main.fmf index fea0ee29a..9f8391d44 100644 --- a/docs/examples/getting_started/nanobind/main.fmf +++ b/docs/examples/getting_started/nanobind/main.fmf @@ -1,7 +1,6 @@ -summary: - Nanobind example project +summary: Nanobind example project adjust: enabled: false because: Nanobind is not yet packaged on Fedora #require+: -# - python3-nanobind +# - python3dist(nanobind) diff --git a/docs/examples/getting_started/pybind11/main.fmf b/docs/examples/getting_started/pybind11/main.fmf index 28197eea1..2308fa3f4 100644 --- a/docs/examples/getting_started/pybind11/main.fmf +++ b/docs/examples/getting_started/pybind11/main.fmf @@ -1,5 +1,4 @@ -summary: - Pybind example project +summary: Pybind example project require+: - gcc-c++ - - pybind11-devel + - python3dist(pybind11) diff --git a/docs/examples/getting_started/swig/main.fmf b/docs/examples/getting_started/swig/main.fmf index 9d977fffb..ba84f71aa 100644 --- a/docs/examples/getting_started/swig/main.fmf +++ b/docs/examples/getting_started/swig/main.fmf @@ -1,4 +1,3 @@ -summary: - Swig example project +summary: Swig example project require+: - swig diff --git a/docs/examples/test.sh b/docs/examples/test.sh index 124ca2805..afcee1617 100755 --- a/docs/examples/test.sh +++ b/docs/examples/test.sh @@ -12,13 +12,15 @@ rlJournalStart fi rlRun "pushd $tmp" rlRun "tree" 0 "Show directory tree" + rlRun "python3 -m venv .venv --system-site-packages" 0 "Create venv with system packages" + rlRun "source .venv/bin/activate" 0 "Activate venv" rlRun "set -o pipefail" rlPhaseEnd rlPhaseStartTest - rlRun "pip install --user . --config-settings=cmake.verbose=true --no-index --no-build-isolation" 0 "Build the python project" + rlRun "pip install . -v --config-settings=build.verbose=true --no-index --no-build-isolation" 0 "Build the python project" if [ "${HAS_PYTEST}" == True ]; then - rlRun "pytest" 0 "Run built-in pytest" + rlRun "python3 -m pytest" 0 "Run built-in pytest" else rlRun "python3 test.py" 0 "Test project is installed correctly" fi