|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
Name: fmf
|
|
|
|
|
Version: 0.5
|
|
|
|
|
Version: 0.16.0
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
|
|
|
|
|
Summary: Flexible Metadata Format
|
|
|
|
@@ -7,42 +7,31 @@ License: GPLv2+
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
URL: https://github.com/psss/fmf
|
|
|
|
|
Source: https://github.com/psss/fmf/releases/download/%{version}/fmf-%{version}.tar.gz
|
|
|
|
|
|
|
|
|
|
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 (py3 executable, py2 & py3 subpackage, auto build requires)
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%bcond_without python2
|
|
|
|
|
%bcond_without python3
|
|
|
|
|
%bcond_with py2executable
|
|
|
|
|
%bcond_with oldreqs
|
|
|
|
|
|
|
|
|
|
# RHEL6 and RHEL7 (py2 executable, py2 subpackage, manual build requires)
|
|
|
|
|
%else
|
|
|
|
|
%if 0%{?rhel} <= 7
|
|
|
|
|
%bcond_without python2
|
|
|
|
|
%bcond_with python3
|
|
|
|
|
%bcond_without py2executable
|
|
|
|
|
%bcond_without oldreqs
|
|
|
|
|
|
|
|
|
|
# RHEL8+ (py3 executable, py3 subpackage, auto build requires)
|
|
|
|
|
%else
|
|
|
|
|
# Fedora or RHEL 8+
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} > 7
|
|
|
|
|
%bcond_with python2
|
|
|
|
|
%bcond_without python3
|
|
|
|
|
%bcond_with py2executable
|
|
|
|
|
%bcond_with oldreqs
|
|
|
|
|
%endif
|
|
|
|
|
%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 fmf package requires corresponding python module
|
|
|
|
|
%if %{with py2executable}
|
|
|
|
|
Requires: python2-%{name}
|
|
|
|
|
# Main tmt package requires the Python module
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
Requires: python2-%{name} == %{version}-%{release}
|
|
|
|
|
%else
|
|
|
|
|
Requires: python%{python3_pkgversion}-%{name}
|
|
|
|
|
Requires: python%{python3_pkgversion}-%{name} == %{version}-%{release}
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
@@ -62,17 +51,16 @@ This package contains the command line tool.
|
|
|
|
|
Summary: %{summary}
|
|
|
|
|
BuildRequires: python2-devel
|
|
|
|
|
BuildRequires: python2-setuptools
|
|
|
|
|
%if %{with oldreqs}
|
|
|
|
|
BuildRequires: pytest
|
|
|
|
|
BuildRequires: PyYAML
|
|
|
|
|
%else
|
|
|
|
|
BuildRequires: python2dist(pytest)
|
|
|
|
|
BuildRequires: python2dist(pyyaml)
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: python2-filelock
|
|
|
|
|
BuildRequires: python2-six
|
|
|
|
|
BuildRequires: git-core
|
|
|
|
|
%{?python_provide:%python_provide python2-%{name}}
|
|
|
|
|
%if %{with oldreqs}
|
|
|
|
|
Requires: PyYAML
|
|
|
|
|
%endif
|
|
|
|
|
Requires: python2-filelock
|
|
|
|
|
Requires: python2-six
|
|
|
|
|
Requires: git-core
|
|
|
|
|
|
|
|
|
|
%description -n python2-%{name}
|
|
|
|
|
The fmf Python module and command line tool implement a flexible
|
|
|
|
@@ -81,20 +69,23 @@ 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.
|
|
|
|
|
%endif
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Python 3
|
|
|
|
|
%if %{with python3}
|
|
|
|
|
%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}-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}
|
|
|
|
@@ -108,55 +99,50 @@ This package contains the Python 3 module.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q
|
|
|
|
|
%autosetup
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
export LANG=en_US.utf-8 # for Python <= 3.6 and EPEL <= 7, but harmless
|
|
|
|
|
%if %{with englocale}
|
|
|
|
|
export LANG=en_US.utf-8
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
%py2_build
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with python3}
|
|
|
|
|
%else
|
|
|
|
|
%py3_build
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%if %{with englocale}
|
|
|
|
|
export LANG=en_US.utf-8
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
%py2_install
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python3}
|
|
|
|
|
%else
|
|
|
|
|
%py3_install
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with py2executable} && %{with python3}
|
|
|
|
|
rm -f %{buildroot}%{_bindir}/*
|
|
|
|
|
%py2_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
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
%{__python2} -m pytest -vv
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python3}
|
|
|
|
|
%{__python3} -m pytest -vv
|
|
|
|
|
%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}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
%{_bindir}/%{name}
|
|
|
|
@@ -168,9 +154,7 @@ export LANG=en_US.utf-8
|
|
|
|
|
%{python2_sitelib}/%{name}/
|
|
|
|
|
%{python2_sitelib}/%{name}-*.egg-info
|
|
|
|
|
%license LICENSE
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python3}
|
|
|
|
|
%else
|
|
|
|
|
%files -n python%{python3_pkgversion}-%{name}
|
|
|
|
|
%{python3_sitelib}/%{name}/
|
|
|
|
|
%{python3_sitelib}/%{name}-*.egg-info
|
|
|
|
@@ -179,6 +163,122 @@ export LANG=en_US.utf-8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* 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
|
|
|
|
|
- Enable copr builds from master for epel-7 as well
|
|
|
|
|
- Define dict method to get child or data item
|
|
|
|
|
- Keep original adjust rules when adjusting nodes
|
|
|
|
|
- Use a deep copy when storing raw node data
|
|
|
|
|
- Fix warnings in pytest
|
|
|
|
|
|
|
|
|
|
* Fri Mar 26 2021 Petr Šplíchal <psplicha@redhat.com> - 0.15.2-1
|
|
|
|
|
- Do not use mutable objects as default arguments
|
|
|
|
|
- A bunch of adjustments for the epel-7 build
|
|
|
|
|
|
|
|
|
|
* Wed Mar 24 2021 Petr Šplíchal <psplicha@redhat.com> - 0.15-1
|
|
|
|
|
- Implement the new 'fmf clean' command
|
|
|
|
|
- Functions to manipulate cache
|
|
|
|
|
- Fetch the whole tree using utils.fetch_tree()
|
|
|
|
|
- Raise FileException on duplicate YAML keys
|
|
|
|
|
- Allow to set desired cache location
|
|
|
|
|
- Adjust support for storing modified data to disk
|
|
|
|
|
- Add support for storing modified metadata to disk
|
|
|
|
|
- Prevent exploring tests in the tmt directory
|
|
|
|
|
- Simplify special distro comparison examples
|
|
|
|
|
- Store command output in run(), fetch() exceptions
|
|
|
|
|
- Use filelock for locking, expand test coverage
|
|
|
|
|
- Adjust locking for Tree.node() and utils.fetch()
|
|
|
|
|
- Use locking to checkout/read tree
|
|
|
|
|
- Enable integration testing with tmt, some cleanup
|
|
|
|
|
- Implement a new method copy() for cloning nodes
|
|
|
|
|
- Adjust fetch() with custom destination and env
|
|
|
|
|
- Support calls fetch(destination, env) and run(env)
|
|
|
|
|
- Use the origin default branch instead of master
|
|
|
|
|
- Store commit hash if the tree is under a git repo
|
|
|
|
|
|
|
|
|
|
* Tue Jan 12 2021 Petr Šplíchal <psplicha@redhat.com> - 0.14-1
|
|
|
|
|
- Adjust context docs, fix typos, style cleanup
|
|
|
|
|
- Left vs Right side in Context matches
|
|
|
|
|
- Simplify deep merging, adjust test suite a bit
|
|
|
|
|
- Implement recursive merging of data
|
|
|
|
|
- Remove the duplicate build job from packit config
|
|
|
|
|
- Adjust 'make test' to work under virtualenv
|
|
|
|
|
- Update the adjust continue key default to True
|
|
|
|
|
|
|
|
|
|
* Wed Nov 18 2020 Petr Šplíchal <psplicha@redhat.com> - 0.13-1
|
|
|
|
|
- Enable copr builds from master, simplify config
|
|
|
|
|
- Adjust documentation for the new Context class
|
|
|
|
|
- Add documentation for the new Context class
|
|
|
|
|
- Add a new Tree.adjust() method for handling rules
|
|
|
|
|
- Context: Better operator names, comments
|
|
|
|
|
- Adjust the new Context implementation
|
|
|
|
|
- Context implementation
|
|
|
|
|
|
|
|
|
|
* Thu Jun 04 2020 Petr Šplíchal <psplicha@redhat.com> - 0.12-1
|
|
|
|
|
- Do git pull in utils.fetch
|
|
|
|
|
- Make fetch._run official as utils.run
|
|
|
|
|
|
|
|
|
|
* Tue Mar 17 2020 Petr Šplíchal <psplicha@redhat.com> - 0.11-2
|
|
|
|
|
- Enable back python2-fmf subpackage for RHEL7
|
|
|
|
|
|
|
|
|
|
* Fri Feb 14 2020 Petr Šplíchal <psplicha@redhat.com> - 0.11-1
|
|
|
|
|
- Add git to BuildRequires (now required by tests)
|
|
|
|
|
- Use coveralls to report coverage results
|
|
|
|
|
- Adjust Tree.node() implementation, extend tests
|
|
|
|
|
- Get metadata for unique id [fix #67]
|
|
|
|
|
- Use the fedora-all target in packit config (#72)
|
|
|
|
|
- Define the full fmf identifier [fix #52]
|
|
|
|
|
- A minor cleanup of the concept documentation
|
|
|
|
|
- Always ignore special system directories
|
|
|
|
|
- Filesystem root and inaccessible dirs [fix #70]
|
|
|
|
|
- Rename the 'testsets' directory to 'plans'
|
|
|
|
|
|
|
|
|
|
* Wed Oct 30 2019 Petr Šplíchal <psplicha@redhat.com> - 0.10-1
|
|
|
|
|
- Mock is not needed for docs, fix missing new line
|
|
|
|
|
- Provide a public static method Tree.init()
|
|
|
|
|
|
|
|
|
|
* Wed Oct 09 2019 Petr Šplíchal <psplicha@redhat.com> - 0.9-1
|
|
|
|
|
- Support custom conjunction like 'or' in listed()
|
|
|
|
|
- Update smoke testset to the latest L2 spec
|
|
|
|
|
- Fix build conditional default for englocale
|
|
|
|
|
- Use raw strings for regular expression patterns
|
|
|
|
|
|
|
|
|
|
* Mon Sep 30 2019 Petr Šplíchal <psplicha@redhat.com> - 0.8-1
|
|
|
|
|
- Update spec to build Python 3 packages only
|
|
|
|
|
- Move unit tests into a separate directory
|
|
|
|
|
- Move testsets, include a super simple smoke test
|
|
|
|
|
- Initial set of stories and tests
|
|
|
|
|
- Enable beakerlib smoke test in the testing farm
|
|
|
|
|
- Add a simple beakerlib test for command line help
|
|
|
|
|
- Clean up the docs build folder directly
|
|
|
|
|
- Enable packit
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2019 Petr Šplíchal <psplicha@redhat.com> - 0.7-1
|
|
|
|
|
- Support both old and new yaml loader
|
|
|
|
|
- Add advanced python filtering [fix #55]
|
|
|
|
|
- Drop explicit locale setting during build and install
|
|
|
|
|
- Drop Python 2 subpackage on Fedora 30+ (#1647798)
|
|
|
|
|
- Better handle yaml errors [fix #50]
|
|
|
|
|
- Support reducing attributes using the "-" suffix
|
|
|
|
|
- Prevent extra new lines in the show() output
|
|
|
|
|
- Adjust FullLoader to load all strings as unicode
|
|
|
|
|
- Suppress yaml warnings by specifying the loader
|
|
|
|
|
- Support Tree.find() for non-leaf nodes as well
|
|
|
|
|
|
|
|
|
|
* Mon Oct 08 2018 Petr Šplíchal <psplicha@redhat.com> 0.6-1
|
|
|
|
|
- Ignore directories with no metadata defined
|
|
|
|
|
- Give a nice error when .fmf file exists [fix #37]
|
|
|
|
|
- Ignore metadata subtrees [fix #43]
|
|
|
|
|
- Support for direct deep dictionary value retrieval
|
|
|
|
|
- Separate exception for missing tree root [fix #42]
|
|
|
|
|
- Move data merging into a separate method [fix #41]
|
|
|
|
|
- Ensure that data or parent are provided for Tree
|
|
|
|
|
- Test coverage for yaml syntax and finding root
|
|
|
|
|
- Do not walk through the whole directory hierarchy
|
|
|
|
|
- Example typo, handle yaml parse errors [fix #38]
|
|
|
|
|
- Require the same version of the rpm package
|
|
|
|
|
|
|
|
|
|
* Tue Jun 12 2018 Petr Šplíchal <psplicha@redhat.com> 0.5-1
|
|
|
|
|
- Add support for subcommands [fix #32]
|
|
|
|
|
- Define metadata tree root [fix #26]
|
|
|
|
|
Petr Šplíchal