Update to 0.6.0.

LICENSES/MIT.txt is now a symlink to `../LICENSE`.

sources

@@ -1,2 +1,2 @@
-SHA512 (tomcli-0.3.0.tar.gz) = 1fb1f89828971d07972a5f55c42335f1f0a8c78686616a1310ba9bc722fc3b6650ed8019ef91941e21c781b74b723ca9107f6e1b7e61639de6660897f841e5bd
-SHA512 (tomcli-0.3.0.tar.gz.asc) = c4aef343865fa396b2e6d5f8ad93207abeaed0426024e7513d286cdab553afa0bd0b274f85b288b4e02852ab0daf2e7c7fade81485077d5c6415a62fdbeb3831
+SHA512 (tomcli-0.6.0.tar.gz) = 19aad51f0b0e8169e427aa4ded1437061377b82b3b00cc3b175bc92bcb1c359c09c7003630e9857694944d701ee6522b35a05a77223aa574afe9f7b03a6337ad
+SHA512 (tomcli-0.6.0.tar.gz.asc) = b76684da7707dc7a25381f974a2d95702ea2e0ce18bbc5057372688da0fc2e0a2039199a70a3936e020336043c94ac0885c26944ff8e28622e94833a526b128a

tomcli.spec

@@ -4,8 +4,33 @@
 # SPDX-License-Identifier: MIT
 # License text: https://spdx.org/licenses/MIT.html
 
+# bconds:
+#   tests
+#       Run unit tests
+#   tomlkit
+#       Enable tomlkit and all extras
+#   manpages
+#       Build manpages using scdoc
+#   bootstrap
+#       Disable tomlkit dependencies and unit tests.
+#       Add ~bootstrap to %%dist
+#       Allows tomcli to be built early in the new Python bootstrap process.
+
+%bcond bootstrap 0
+%bcond tomlkit %{without bootstrap}
+%bcond tests %{without bootstrap}
+%bcond manpages 1
+
+# Add minimal py3_test_envvars for EPEL 9
+%if %{undefined py3_test_envvars}
+%define py3_test_envvars %{shrink:
+PYTHONPATH=%{buildroot}%{python3_sitelib}
+PATH=%{buildroot}%{_bindir}:${PATH}
+}
+%endif
+
 Name:           tomcli
-Version:        0.3.0
+Version:        0.6.0
 Release:        1%{?dist}
 Summary:        CLI for working with TOML files. Pronounced "tom clee."
 
@@ -19,14 +44,18 @@ Source2:        https://meta.sr.ht/~gotmax23.pgp
 BuildArch:      noarch
 BuildRequires:  gnupg2
 BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist pytest}
+%if %{with manpages}
+BuildRequires:  scdoc
+%endif
 
 # One of the TOML backends is required
 Requires:       (%{py3_dist tomcli[tomlkit]} or %{py3_dist tomcli[tomli]})
+%if %{with tomlkit}
 # Prefer the tomlkit backend
 Suggests:       %{py3_dist tomcli[tomlkit]}
 # Recommend the 'all' extra
 Recommends:     %{py3_dist tomcli[all]}
+%endif
 
 
 %description
@@ -39,53 +68,89 @@ tomcli is a CLI for working with TOML files. Pronounced "tom clee."
 
 
 %generate_buildrequires
-%pyproject_buildrequires -x all,tomlkit,tomli,test %{?el9:-w}
+%{pyproject_buildrequires %{shrink:
+    -x tomli
+    %{?with_tomlkit:-x all,tomlkit}
+    %{?with_tests:-x test}
+}}
 
 
 %build
 %pyproject_wheel
 
+%if %{with manpages}
+for page in doc/*.scd; do
+    dest="${page%.scd}"
+    scdoc <"${page}" >"${dest}"
+done
+%endif
+
 
 %install
 %pyproject_install
 %pyproject_save_files tomcli
 
-mkdir -p %{buildroot}%{bash_completions_dir}
-mkdir -p %{buildroot}%{fish_completions_dir}
-mkdir -p %{buildroot}%{zsh_completions_dir}
+# Install manpages
+install -Dpm 0644 doc/*.1 -t %{buildroot}%{_mandir}/man1
 
+# Install shell completions
 (
-export PYTHONPATH="%{buildroot}%{python3_sitelib}"
-export _TYPER_COMPLETE_TEST_DISABLE_SHELL_DETECTION=1
-for command in %{buildroot}%{_bindir}/tomcli*; do
-    $command --show-completion=bash > "%{buildroot}%{bash_completions_dir}/$(basename $command)"
-    $command --show-completion=fish > "%{buildroot}%{fish_completions_dir}/$(basename $command).fish"
-    $command --show-completion=zsh > "%{buildroot}%{zsh_completions_dir}/_$(basename $command)"
-done
+export %{py3_test_envvars}
+%{python3} compgen.py \
+    --installroot %{buildroot} \
+    --bash-dir %{bash_completions_dir} \
+    --fish-dir %{fish_completions_dir} \
+    --zsh-dir %{zsh_completions_dir}
 )
 
 
 %check
+# Smoke test
+(
+export %{py3_test_envvars}
+TOMCLI="%{buildroot}%{_bindir}/tomcli"
+cp pyproject.toml test.toml
+name="$($TOMCLI get test.toml project.name)"
+test "${name}" = "tomcli"
+
+$TOMCLI set test.toml str project.name not-tomcli
+newname="$($TOMCLI get test.toml project.name)"
+test "${newname}" = "not-tomcli"
+)
+
+%pyproject_check_import
+%if %{with tests}
 %pytest
+%endif
 
 
-%pyproject_extras_subpkg -n tomcli all tomli tomlkit
+%pyproject_extras_subpkg -n tomcli %{?with_tomlkit:all tomlkit} tomli
 
 
 %files -f %{pyproject_files}
-# I prefer not to rely on %%pyproject_save_files to mark files with %%license.
-# Also, Fedora's hatchling supports the current draft of PEP 639, but EPEL 9's
-# does not.
-%license LICENSES/*.txt
+%license LICENSE
 %doc README.md
 %doc NEWS.md
 %{_bindir}/tomcli*
 %{bash_completions_dir}/tomcli*
 %{fish_completions_dir}/tomcli*.fish
 %{zsh_completions_dir}/_tomcli*
+%{_mandir}/man1/tomcli*.1*
 
 
 %changelog
+* Thu Mar 28 2024 Maxwell G <maxwell@gtmx.me> - 0.6.0-1
+- Update to 0.6.0.
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Dec 22 2023 Maxwell G <maxwell@gtmx.me> - 0.5.0-2
+- Fix installation of license files
+
+* Thu Dec 14 2023 Maxwell G <maxwell@gtmx.me> - 0.5.0-1
+- Update to 0.5.0.
+
 * Thu Sep 07 2023 Maxwell G <maxwell@gtmx.me> - 0.3.0-1
 - Update to 0.3.0.