diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-tomli.changes b/python-tomli.changes index 462369c..08ca7c2 100644 --- a/python-tomli.changes +++ b/python-tomli.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Oct 15 19:03:22 UTC 2021 - Ben Greiner + +- Yet another dependency cycle to break: tomli - flit_core - tomli + https://flit.readthedocs.io/en/latest/bootstrap.html + +------------------------------------------------------------------- +Fri Oct 15 08:49:47 UTC 2021 - Dominique Leuenberger + +- BuildIgnore ca-certificates: python-pip brings it in for regular + operation, but as we do not ever do https:// connections during a + build we do not depend on certificates. Allows us to break up a + build cycle. + +------------------------------------------------------------------- +Wed Oct 13 19:20:13 UTC 2021 - Ben Greiner + +- Split build and tests in _multibuild in order to avoid depcycle + ------------------------------------------------------------------- Sun Oct 3 19:30:44 UTC 2021 - Ben Greiner diff --git a/python-tomli.spec b/python-tomli.spec index 941aee7..2a7a537 100644 --- a/python-tomli.spec +++ b/python-tomli.spec @@ -1,5 +1,5 @@ # -# spec file for package python-tomli +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,9 +16,17 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -Name: python-tomli +Name: python-tomli%{psuffix} Version: 1.2.1 Release: 0 Summary: A lil' TOML parser @@ -28,9 +36,19 @@ URL: https://github.com/hukkin/tomli Source: https://github.com/hukkin/tomli/archive/refs/tags/%{version}.tar.gz#/tomli-%{version}-gh.tar.gz BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} +# Avoid build cycles +# https://flit.readthedocs.io/en/latest/bootstrap.html +#!BuildIgnore: python3-tomli +#!BuildIgnore: python36-tomli +#!BuildIgnore: python38-tomli +#!BuildIgnore: python39-tomli +#!BuildIgnore: python310-tomli +#!BuildIgnore: ca-certificates +%if %{with test} BuildRequires: %{python_module pytest-randomly} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-dateutil} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros BuildArch: noarch @@ -43,19 +61,24 @@ Tomli is a Python library for parsing TOML %setup -q -n tomli-%{version} %build +export PYTHONPATH=$PWD %pyproject_wheel %install +%if ! %{with test} %pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%check -%pytest - %files %{python_files} %license LICENSE %doc README.md %{python_sitelib}/tomli %{python_sitelib}/tomli-%{version}*-info +%else + +%check +%pytest +%endif + %changelog