Add more File api functions to Tree

.git_archival.txt

@@ -0,0 +1,4 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
+ref-names: $Format:%D$

.gitattributes

@@ -0,0 +1 @@
+.git_archival.txt  export-subst

.github/codecov.yml

@@ -0,0 +1,3 @@
+codecov:
+  notify:
+    after_n_builds: 4

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+name: CI
+
+on:
+  workflow_dispatch:
+    inputs:
+      upload-wheel:
+        type: boolean
+        required: false
+        default: false
+        description: Upload wheel as an artifact
+  pull_request:
+  push:
+    branches: [ main ]
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  tests:
+    uses: ./.github/workflows/step_test.yml
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+  build-wheel:
+    uses: ./.github/workflows/step_build-wheel.yml
+    needs: [ tests ]
+    with:
+      upload: ${{ inputs.upload-wheel || false }}

.github/workflows/release.yml

@@ -10,17 +10,30 @@ on:
         required: true
 
 jobs:
-  release:
+  build-wheel:
+    name: Build wheel
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         if: ${{ github.event_name == 'release' }}
-      - uses: actions/checkout@v2
-        if: ${{ github.event_name == 'workflow_dispatch' }}
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.inputs.ref }}
-      - name: Create dist
-        run: make wheel
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+      - name: Build package
+        run: pipx run build
+      - uses: actions/upload-artifact@v3
+        with:
+          path: dist/*
+  release:
+    name: Prepare release
+    runs-on: ubuntu-latest
+    needs: [build-wheel]
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
       - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

.github/workflows/step_build-wheel.yml

@@ -0,0 +1,23 @@
+on:
+  workflow_call:
+    inputs:
+      upload:
+        required: false
+        type: boolean
+        default: true
+        description: Upload wheel as artifact
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build package
+        run: pipx run build
+      - uses: actions/upload-artifact@v3
+        with:
+          path: dist/*
+        if: ${{ inputs.upload }}

.github/workflows/step_test.yml

@@ -0,0 +1,42 @@
+on:
+  workflow_call:
+    secrets:
+      CODECOV_TOKEN:
+        required: false
+        description: Codecov token
+
+permissions:
+  contents: read
+
+jobs:
+  pre-commit:
+    name: Run pre-commit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+      - uses: pre-commit/[email protected]
+
+  checks:
+    name:
+      Check 🐍 ${{ matrix.python-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
+
+      - name: Install package
+        run: pip install -e.[tests-cov]
+      - name: Test package
+        run: pytest --cov --cov-report=xml
+      - name: Upload coverage report
+        uses: codecov/codecov-action@v3
+        with:
+          name: python-${{ matrix.python-version }}

.packit.yaml

@@ -5,37 +5,38 @@ synced_files:
 upstream_package_name: fmf
 downstream_package_name: fmf
 
+# Epel9 fails to build with dynamic version. Need to create archive with PKG-INFO
+# F37 works with setuptools_scm 7.0
 actions:
   create-archive:
-  - make tarball
+    - "python3 -m build --sdist --outdir ."
+    - "sh -c 'echo fmf-$(hatch version).tar.gz'"
   get-current-version:
-  - make version
+    - "hatch version"
 
 srpm_build_deps:
-  - make
-  - python3-docutils
+  - python3-build
+  - hatch
+  - python3-hatch-vcs
 
 jobs:
   - job: copr_build
     trigger: pull_request
     targets:
     - fedora-all
-    - epel-8
     - epel-9
 
   - job: tests
     trigger: pull_request
     targets:
     - fedora-all
-    - epel-8
     - epel-9
 
   - job: copr_build
     trigger: commit
     branch: main
     targets:
     - fedora-all
-    - epel-8
     - epel-9
     list_on_homepage: True
     preserve_project: True

.pre-commit-config.yaml

@@ -38,3 +38,11 @@ repos:
       - id: end-of-file-fixer
       - id: mixed-line-ending
       - id: trailing-whitespace
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: "v1.4.1"
+    hooks:
+      - id: mypy
+        files: ^(fmf)
+        additional_dependencies:
+          - types-jsonschema

.readthedocs.yaml

@@ -1,5 +1,11 @@
 # Config for building https://fmf.readthedocs.io/
 version: 2
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+sphinx:
+  configuration: docs/conf.py
 python:
     install:
       - method: pip

Makefile

@@ -1,12 +1,10 @@
 # Prepare variables
 TMP = $(CURDIR)/tmp
-VERSION = $(shell grep ^Version fmf.spec | sed 's/.* //')
-COMMIT = $(shell git rev-parse --short HEAD)
-REPLACE_VERSION = "s/running from the source/$(VERSION) ($(COMMIT))/"
+VERSION = $(hatch version)
 PACKAGE = fmf-$(VERSION)
 FILES = LICENSE README.rst \
-		Makefile fmf.spec setup.py \
-		examples fmf bin tests
+		Makefile fmf.spec pyproject.toml \
+		examples fmf tests
 
 # Define special targets
 all: docs packages
@@ -19,11 +17,11 @@ tmp:
 
 # Run the test suite, optionally with coverage
 test: tmp
-	pytest tests/unit -c tests/unit/pytest.ini
+	pytest tests/unit
 smoke: tmp
-	pytest tests/unit/test_smoke.py -c tests/unit/pytest.ini
+	pytest tests/unit/test_smoke.py
 coverage: tmp
-	coverage run --source=fmf,bin -m py.test -c tests/unit/pytest.ini tests
+	coverage run --source=fmf -m py.test tests
 	coverage report
 	coverage annotate
 
@@ -42,12 +40,9 @@ source: clean tmp
 	mkdir -p $(TMP)/SOURCES
 	mkdir -p $(TMP)/$(PACKAGE)
 	cp -a $(FILES) $(TMP)/$(PACKAGE)
-	sed -i $(REPLACE_VERSION) $(TMP)/$(PACKAGE)/fmf/__init__.py
 tarball: source man
 	cd $(TMP) && tar cfz SOURCES/$(PACKAGE).tar.gz $(PACKAGE)
 	@echo ./tmp/SOURCES/$(PACKAGE).tar.gz
-version:
-	@echo "$(VERSION)"
 rpm: tarball
 	rpmbuild --define '_topdir $(TMP)' -bb fmf.spec
 srpm: tarball
@@ -57,8 +52,7 @@ packages: rpm srpm
 
 # Python packaging
 wheel:
-	python setup.py bdist_wheel
-	python3 setup.py bdist_wheel
+	python3 -m build
 upload:
 	twine upload dist/*.whl