4 Commits

Author SHA1 Message Date
Petr Šplíchal 379f3f2e67 Release fmf-1.0.0 2021-11-11 11:52:36 +01:00
Petr Šplíchal 33cfb90cb4 Report test results as separate plans 2021-10-11 10:50:04 +02:00
Fedora Release Engineering ee1cb0b758 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 23:10:12 +00:00
Python Maint 9cbe1d61af Rebuilt for Python 3.10 2021-06-04 20:04:25 +02:00
4 changed files with 15 additions and 91 deletions
+1
View File
@@ -11,3 +11,4 @@
/fmf-0.15.tar.gz
/fmf-0.15.2.tar.gz
/fmf-0.16.0.tar.gz
/fmf-1.0.0.tar.gz
+1
View File
@@ -0,0 +1 @@
resultsdb-testcase: separate
+12 -90
View File
@@ -1,5 +1,5 @@
Name: fmf
Version: 0.16.0
Version: 1.0.0
Release: 1%{?dist}
Summary: Flexible Metadata Format
@@ -9,30 +9,8 @@ BuildArch: noarch
URL: https://github.com/psss/fmf
Source0: https://github.com/psss/fmf/releases/download/%{version}/fmf-%{version}.tar.gz
# Depending on the distro, we set some defaults.
# Note that the bcond macros are named for the CLI option they create.
# "%%bcond_without" means "ENABLE by default and create a --without option"
# Fedora or RHEL 8+
%if 0%{?fedora} || 0%{?rhel} > 7
%bcond_with python2
%bcond_with oldreqs
%bcond_with englocale
# RHEL 7
%else
%bcond_without python2
# The automatic runtime dependency generator doesn't exist yet
%bcond_without oldreqs
# The C.UTF-8 locale doesn't exist, Python defaults to C (ASCII)
%bcond_without englocale
%endif
# Main tmt package requires the Python module
%if %{with python2}
Requires: python2-%{name} == %{version}-%{release}
%else
# Main fmf package requires the Python module
Requires: python%{python3_pkgversion}-%{name} == %{version}-%{release}
%endif
%description
The fmf Python module and command line tool implement a flexible
@@ -45,48 +23,16 @@ This package contains the command line tool.
%?python_enable_dependency_generator
# Python 2
%if %{with python2}
%package -n python2-%{name}
Summary: %{summary}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: pytest
BuildRequires: PyYAML
BuildRequires: python2-filelock
BuildRequires: python2-six
BuildRequires: git-core
%{?python_provide:%python_provide python2-%{name}}
Requires: PyYAML
Requires: python2-filelock
Requires: python2-six
Requires: git-core
%description -n python2-%{name}
The fmf Python module and command line tool implement a flexible
format for defining metadata in plain text files which can be
stored close to the source code. Thanks to hierarchical structure
with support for inheritance and elasticity it provides an
efficient way to organize data into well-sized text documents.
This package contains the Python 2 module.
%else
# Python 3
%package -n python%{python3_pkgversion}-%{name}
Summary: %{summary}
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-pytest
BuildRequires: python%{python3_pkgversion}-PyYAML
BuildRequires: python%{python3_pkgversion}-ruamel-yaml
BuildRequires: python%{python3_pkgversion}-filelock
BuildRequires: git-core
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
Requires: git-core
%if %{with oldreqs}
Requires: python%{python3_pkgversion}-PyYAML
Requires: python%{python3_pkgversion}-filelock
%endif
%description -n python%{python3_pkgversion}-%{name}
The fmf Python module and command line tool implement a flexible
@@ -95,7 +41,6 @@ stored close to the source code. Thanks to hierarchical structure
with support for inheritance and elasticity it provides an
efficient way to organize data into well-sized text documents.
This package contains the Python 3 module.
%endif
%prep
@@ -103,42 +48,17 @@ This package contains the Python 3 module.
%build
%if %{with englocale}
export LANG=en_US.utf-8
%endif
%if %{with python2}
%py2_build
%else
%py3_build
%endif
%install
%if %{with englocale}
export LANG=en_US.utf-8
%endif
%if %{with python2}
%py2_install
%else
%py3_install
%endif
mkdir -p %{buildroot}%{_mandir}/man1
install -pm 644 fmf.1* %{buildroot}%{_mandir}/man1
%check
%if %{with englocale}
export LANG=en_US.utf-8
%endif
%if %{with python2}
%{__python2} -m pytest -vv -c tests/unit/pytest.ini -m 'not web'
%else
%{__python3} -m pytest -vv -c tests/unit/pytest.ini -m 'not web'
%endif
%{!?_licensedir:%global license %%doc}
@@ -149,20 +69,22 @@ export LANG=en_US.utf-8
%doc README.rst examples
%license LICENSE
%if %{with python2}
%files -n python2-%{name}
%{python2_sitelib}/%{name}/
%{python2_sitelib}/%{name}-*.egg-info
%license LICENSE
%else
%files -n python%{python3_pkgversion}-%{name}
%{python3_sitelib}/%{name}/
%{python3_sitelib}/%{name}-*.egg-info
%license LICENSE
%endif
%changelog
* Thu Nov 11 2021 Petr Šplíchal <psplicha@redhat.com> - 1.0.0-1
- Migrate yaml parsing to ruamel.yaml
- Drop support for Python 2
- Add extra requires and enable readthedocs config (#143)
- Filter accept value with a colon
- Adjust style to fix issues revealed by pre-commit
- Enable pre-commit, update contribution docs
- Disable integration testing with tmt for centos-7
* Thu Apr 15 2021 Petr Šplíchal <psplicha@redhat.com> - 0.16.0-1
- Add support for empty files and virtual nodes
- Change outcome of CannotDecide operations
+1 -1
View File
@@ -1 +1 @@
SHA512 (fmf-0.16.0.tar.gz) = 1275afb61e72af95cd87731e8495419d5a46fa76770b9caf8a1b4ec3993230c91b7bbaf217bcc465b88468433ca3484634710d327241299a3d8b330d26abe2c0
SHA512 (fmf-1.0.0.tar.gz) = b882860067a65b09bd73d1c7038e3bcc5168724cd9404a1be44e8aea097d32278a283578f32fa5f3cecbd2ad3561d8fd936e5cf835d92f34bf5468caeeb6f7db