22 Commits

Author SHA1 Message Date
Lukáš Zachar 279a56d18f Upstream hotfix 2024-06-17 17:48:53 +02:00
Petr Šplíchal 0bb1a6fc69 Release fmf-1.4.0 2024-06-05 16:03:51 +02:00
Fedora Release Engineering 6d3d245879 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 11:48:48 +00:00
Fedora Release Engineering ab09665a3f Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 19:33:28 +00:00
Petr Šplíchal a7010a89e8 Release fmf-1.3.0 2023-10-02 17:15:16 +02:00
Petr Šplíchal 8a7a321238 Install yq which is needed by some newer tests 2023-10-02 17:15:16 +02:00
Fedora Release Engineering b09044e488 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 19:58:35 +00:00
Python Maint 5d6455fdf3 Rebuilt for Python 3.12 2023-06-15 12:52:03 +02:00
Petr Šplíchal 237eb03c15 Update urls of the upstream test repositories 2023-02-06 15:34:11 +01:00
Miro Hrončok 0b07d69e08 Rebuilt to change Python shebangs to /usr/bin/python3.6 on EPEL 8
See https://lists.fedoraproject.org/archives/list/epel-devel@lists.fedoraproject.org/thread/RE3PG72B5AX7NTACPDSBGOWCMN7I3OQJ/
2023-02-06 15:05:30 +01:00
Fedora Release Engineering 08e2b1f2cc Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 03:40:24 +00:00
Lukas Zachar 3f4f3cd4fc Release fmf-1.2.1 2022-07-21 13:22:52 +02:00
Fedora Release Engineering a3d29eef74 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 03:24:02 +00:00
Lukas Zachar 3be47d6c62 Release fmf-1.2.0 2022-07-19 11:25:05 +02:00
Python Maint 2238afd687 Rebuilt for Python 3.11 2022-06-13 19:48:34 +02:00
Petr Šplíchal d8668428d8 Run Tier 1 integration tests to speed up testing
The whole Tier 2 coverage is already executed upstream and there
is nothing special about the Fedora environment to run them again.
2022-06-09 18:06:56 +02:00
Lukas Zachar e51e5a69ba Release fmf-1.1.0 2022-06-08 18:46:45 +02:00
Fedora Release Engineering 502cfa3c19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 03:13:16 +00:00
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
7 changed files with 90 additions and 98 deletions
+7
View File
@@ -11,3 +11,10 @@
/fmf-0.15.tar.gz
/fmf-0.15.2.tar.gz
/fmf-0.16.0.tar.gz
/fmf-1.0.0.tar.gz
/fmf-1.1.0.tar.gz
/fmf-1.2.0.tar.gz
/fmf-1.2.1.tar.gz
/fmf-1.3.0.tar.gz
/fmf-1.4.0.tar.gz
/fmf-1.4.1.tar.gz
+1
View File
@@ -0,0 +1 @@
resultsdb-testcase: separate
+69 -90
View File
@@ -1,5 +1,5 @@
Name: fmf
Version: 0.16.0
Version: 1.4.1
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,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
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: python%{python3_pkgversion}-jsonschema
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 +42,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 +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
%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 +70,78 @@ 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
* Mon Jun 17 2024 Lukáš Zachar <lzachar@redhat.com> - 1.4.1-1
- Use local dict instead of modifying `locals()`
* Wed Jun 05 2024 Petr Šplíchal <psplicha@redhat.com> - 1.4.0-1
- Introduce a new page for release notes
- Extend the `filter()` documentation slightly
- Implement the '~' merge operation
- Support escaping `|` and `&` in `utils.filter()`
- Accept additional rules in the `adjust()` call (#230)
- Avoid `copy()` calls in `adjust()`
- Directive `select` to control node selection
- Allow filtering based on the node name
- Drop epel-8
- Fix github action
- Remove travis.yaml
- Turn schema validation method into a stand-alone function
- Limit number of tests run for integration with tmt (#225)
- Add a `Toolbelt Catalog` entry for `fmf`
* Fri Sep 29 2023 Petr Šplíchal <psplicha@redhat.com> - 1.3.0-1
- Allow case-insensitive context matching
- Move the copr repository to the `teemtee` group
- Fix missing file require for unit tests
- Add callback to adjust() to make it observable by callers
- Drop support for `el-8` and `python-3.6`
- Fix docs building on readthedocs
- Install `yq` needed for `tmt` integration tests
- Include `srpm_build_deps` in the packit config
- Remove `metadata` from Packit config
- Add missing build job to Packit config
- Update pre-commit checks to the latest versions
- Require `fmf` in tests, remove obsolete coverage
- Fix a typo in the merging minus sign documentation
* 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
+1 -1
View File
@@ -1,5 +1,5 @@
prepare:
how: install
- how: install
package: fmf
execute:
how: tmt
+10 -5
View File
@@ -1,11 +1,16 @@
summary: Integration with tmt
discover:
how: fmf
url: https://github.com/psss/tmt
url: https://github.com/teemtee/tmt
ref: fedora
filter: 'tier: 1, 2'
prepare:
how: install
filter: tier:1
prepare+:
- how: install
package:
- fmf
- jq
- python3-pip
- tmt-all
- how: shell
script:
- pip3 install --user yq || pip3 install yq
- yq --help
+1 -1
View File
@@ -1,5 +1,5 @@
summary: Upstream fmf tests
discover:
how: fmf
url: https://github.com/psss/fmf
url: https://github.com/teemtee/fmf
ref: fedora
+1 -1
View File
@@ -1 +1 @@
SHA512 (fmf-0.16.0.tar.gz) = 1275afb61e72af95cd87731e8495419d5a46fa76770b9caf8a1b4ec3993230c91b7bbaf217bcc465b88468433ca3484634710d327241299a3d8b330d26abe2c0
SHA512 (fmf-1.4.1.tar.gz) = 3ea8596bd7f678aea1aafe8e1fefecbabe96c4e9e9b67c43450594c2769b3de0768b1bd531bbd2a3d7add1d24b14c69ec3a8d2c8013e1d799b7e2ce723a3ac1f