|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
Name: fmf
|
|
|
|
|
Version: 0.12
|
|
|
|
|
Version: 1.2.1
|
|
|
|
|
Release: 1%{?dist}
|
|
|
|
|
|
|
|
|
|
Summary: Flexible Metadata Format
|
|
|
|
@@ -9,25 +9,7 @@ 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
|
|
|
|
|
# Main fmf package requires the Python module
|
|
|
|
|
Requires: python%{python3_pkgversion}-%{name} == %{version}-%{release}
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
@@ -41,39 +23,17 @@ 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
|
|
|
|
|
%{?python_provide:%python_provide python2-%{name}}
|
|
|
|
|
Requires: PyYAML
|
|
|
|
|
|
|
|
|
|
%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.
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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: python%{python3_pkgversion}-jsonschema
|
|
|
|
|
BuildRequires: git-core
|
|
|
|
|
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
|
|
|
|
|
%if %{with oldreqs}
|
|
|
|
|
Requires: python%{python3_pkgversion}-PyYAML
|
|
|
|
|
%endif
|
|
|
|
|
Requires: git-core
|
|
|
|
|
|
|
|
|
|
%description -n python%{python3_pkgversion}-%{name}
|
|
|
|
|
The fmf Python module and command line tool implement a flexible
|
|
|
|
@@ -89,42 +49,17 @@ This package contains the Python 3 module.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%if %{with englocale}
|
|
|
|
|
export LANG=en_US.utf-8
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
%py2_build
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%py3_build
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%if %{with englocale}
|
|
|
|
|
export LANG=en_US.utf-8
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{with python2}
|
|
|
|
|
%py2_install
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%py3_install
|
|
|
|
|
|
|
|
|
|
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 -m 'not web'
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%{__python3} -m pytest -vv -m 'not web'
|
|
|
|
|
%{__python3} -m pytest -vv -c tests/unit/pytest.ini -m 'not web'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
|
@@ -135,13 +70,6 @@ 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
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files -n python%{python3_pkgversion}-%{name}
|
|
|
|
|
%{python3_sitelib}/%{name}/
|
|
|
|
|
%{python3_sitelib}/%{name}-*.egg-info
|
|
|
|
@@ -149,6 +77,89 @@ export LANG=en_US.utf-8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Jul 21 2022 Lukáš Zachar <lzachar@redhat.com> - 1.2.1-1
|
|
|
|
|
- Retry if shallow clone fails
|
|
|
|
|
|
|
|
|
|
* Tue Jul 19 2022 Lukáš Zachar <lzachar@redhat.com> - 1.2.0-1
|
|
|
|
|
- Shallow git clone if no reference is used
|
|
|
|
|
- Select by the source of object
|
|
|
|
|
- Enable the flake8 check, fix detected issues
|
|
|
|
|
- Make when in adjust optional, add true|false expr.
|
|
|
|
|
- Version as fmf flag and module attribute
|
|
|
|
|
|
|
|
|
|
* Wed Jun 08 2022 Lukáš Zachar <lzachar@redhat.com> - 1.1.0-1
|
|
|
|
|
- Implement a directive for disabling inheritance
|
|
|
|
|
- Add support for prepending items during merging
|
|
|
|
|
- Explicitly convert context value to string
|
|
|
|
|
- Workaround s390x ruamel read issue
|
|
|
|
|
- Support reference schemas in validation function
|
|
|
|
|
- Add JSON Schema validation method
|
|
|
|
|
- Fixes blocking with symbolic link loops
|
|
|
|
|
- Use a better way to detect the default git branch
|
|
|
|
|
- Add unit tests for comma operator in context rules
|
|
|
|
|
- Add examples demonstrating the context syntax
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
- 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
|
|
|
|
|
Lukas Zachar