Update to 1.7.0 upstream release

Upstream tag: 1.7.0
Upstream commit: 70f73da7

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -15,3 +15,10 @@
 /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
+/fmf-1.5.0.tar.gz
+/fmf-1.6.0.tar.gz
+/fmf-1.6.1.tar.gz
+/fmf-1.7.0.tar.gz

.packit.yaml

@@ -0,0 +1,80 @@
+specfile_path: fmf.spec
+files_to_sync:
+  - fmf.spec
+  - .packit.yaml
+
+upstream_package_name: fmf
+downstream_package_name: fmf
+
+# Epel9 fails to build because of too old version of setuptools_scm
+# Need to create archive with PKG-INFO
+actions:
+  create-archive:
+    - "hatch build -t sdist"
+    - "sh -c 'echo dist/fmf-*.tar.gz'"
+  get-current-version:
+    - hatch version
+
+# Common definitions
+_:
+  # Copr setup
+  - &copr
+    list_on_homepage: True
+    preserve_project: True
+    owner: "@teemtee"
+
+  # Supported targets
+  - targets: &targets
+      - fedora-all
+      - epel-9
+      - epel-10
+
+srpm_build_deps:
+  - hatch
+
+jobs:
+  # Build pull requests
+  - job: copr_build
+    trigger: pull_request
+    targets: *targets
+
+  # Test pull requests
+  - job: tests
+    trigger: pull_request
+    targets: *targets
+
+  # Build commits merged to main (copr latest)
+  - job: copr_build
+    trigger: commit
+    branch: main
+    targets: *targets
+    <<: *copr
+    project: latest
+    release_suffix: "{PACKIT_PROJECT_BRANCH}"
+
+  # Build release (copr stable)
+  - job: copr_build
+    trigger: release
+    targets: *targets
+    <<: *copr
+    project: stable
+
+  # Propose downstream pull requests
+  - job: propose_downstream
+    trigger: release
+    dist_git_branches: *targets
+
+  # Build in Koji
+  - job: koji_build
+    trigger: commit
+    allowed_pr_authors: ["packit", "all_committers"]
+    allowed_committers: ["packit", "all_committers"]
+    dist_git_branches: *targets
+
+  # Create bodhi updates
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched
+      - epel-9
+      - epel-10

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.2.0.post1.dev3+g3adf9afe.

fmf.spec

@@ -1,16 +1,22 @@
-Name: fmf
-Version: 1.2.1
-Release: 1%{?dist}
+Name:          fmf
+Version:       1.7.0
+Release:       1%{?dist}
 
-Summary: Flexible Metadata Format
-License: GPLv2+
-BuildArch: noarch
+Summary:       Flexible Metadata Format
+License:       GPL-2.0-or-later
+BuildArch:     noarch
 
-URL: https://github.com/psss/fmf
-Source0: https://github.com/psss/fmf/releases/download/%{version}/fmf-%{version}.tar.gz
+URL:           https://github.com/teemtee/fmf
+Source:        %{pypi_source fmf}
 
 # Main fmf package requires the Python module
-Requires: python%{python3_pkgversion}-%{name} == %{version}-%{release}
+BuildRequires: python3-devel
+BuildRequires: python3dist(docutils)
+BuildRequires: git-core
+Requires:      git-core
+
+Obsoletes:     python3-fmf < %{version}-%{release}
+%py_provides   python3-fmf
 
 %description
 The fmf Python module and command line tool implement a flexible
@@ -18,65 +24,88 @@ 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 command line tool.
-
-%?python_enable_dependency_generator
-
-
-%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}-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
-
-%description -n python%{python3_pkgversion}-%{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 3 module.
 
 
 %prep
-%autosetup
+%autosetup -p1 -n fmf-%{version}
+
+
+%generate_buildrequires
+%pyproject_buildrequires -x tests %{?epel:-w}
 
 
 %build
-%py3_build
+%pyproject_wheel
+cp docs/header.txt man.rst
+tail -n+7 README.rst >> man.rst
+rst2man man.rst > fmf.1
 
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files fmf
+
 mkdir -p %{buildroot}%{_mandir}/man1
 install -pm 644 fmf.1* %{buildroot}%{_mandir}/man1
 
 
 %check
-%{__python3} -m pytest -vv -c tests/unit/pytest.ini -m 'not web'
+%pyproject_check_import
 
 
-%{!?_licensedir:%global license %%doc}
-
-%files
+%files -f %{pyproject_files}
 %{_mandir}/man1/*
 %{_bindir}/%{name}
 %doc README.rst examples
-%license LICENSE
-
-%files -n python%{python3_pkgversion}-%{name}
-%{python3_sitelib}/%{name}/
-%{python3_sitelib}/%{name}-*.egg-info
-%license LICENSE
 
 
 %changelog
+* Fri Mar 07 2025 Packit <hello@packit.dev> - 1.7.0-1
+- Update to version 1.7.0
+
+* Fri Jan 17 2025 Packit <hello@packit.dev> - 1.6.1-1
+- Update to version 1.6.1
+
+* Tue Jan 07 2025 Packit <hello@packit.dev> - 1.6.0-1
+- Update to version 1.6.0
+
+* Wed Dec 04 2024 Packit <hello@packit.dev> - 1.5.0-1
+- Update to version 1.5.0
+
+* 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
 

plans/main.fmf

@@ -1,5 +1,5 @@
 prepare:
-    how: install
+  - how: install
     package: fmf
 execute:
     how: tmt

plans/tmt.fmf

@@ -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
-prepare:
-    how: install
+prepare+:
+  - how: install
     package:
-      - fmf
+      - jq
+      - python3-pip
       - tmt-all
+  - how: shell
+    script:
+      - pip3 install --user yq || pip3 install yq
+      - yq --help

plans/upstream.fmf

@@ -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

sources

@@ -1 +1 @@
-SHA512 (fmf-1.2.1.tar.gz) = 1857ab77a2187df7f92b223b1404478a2217f53ba7a5d16140fda1cd527214fe5df1ebf5ca818a2aae0872568608c0c69e2b16aa3d2252d2fdcd533b2d828d27
+SHA512 (fmf-1.7.0.tar.gz) = b78fa3730da01ce13dbb09c54e9e3977c26e90f6d4f13ffbc166f88d040adf7931fe6759c3de991ec8a261b676d8825f44517e417523693aae7e76f9b4557222