Switch from setup.py to pyproject.toml

Complete migration from setup.py to pyproject.toml. This required some
code reorganizing, but everything should be in fairly sane places.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

71 files changed, 71 insertions, 62 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 484d8c2..79015e0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include COPYING
-include man/*.rst
-include *.example
+include src/b4/man/*.rst
+include src/b4/templates/*
diff --git a/b4.sh b/b4.sh
index bd7e587..fd985b4 100755
--- a/b4.sh
+++ b/b4.sh
@@ -7,4 +7,4 @@ REAL_SCRIPT=$(realpath -e ${BASH_SOURCE[0]})
 SCRIPT_TOP="${SCRIPT_TOP:-$(dirname ${REAL_SCRIPT})}"
 
 PYTHONPATH="${SCRIPT_TOP}:${SCRIPT_TOP}/patatt${PYTHONPATH:+:$PYTHONPATH}" \
-	exec python3 "${SCRIPT_TOP}/b4/command.py" "${@}"
+	exec python3 "${SCRIPT_TOP}/src/b4/command.py" "${@}"
diff --git a/plan.otl b/plan.otl
new file mode 100644
index 0000000..cb32e7c
--- /dev/null
+++ b/plan.otl
@@ -0,0 +1,16 @@
+v0.14
+-----
+[_] Switch to using pyproject.toml
+[_] Use hashed requirements for added security and reproducible installs
+[_] Automatic interdependency resolution
+	[_] Retrieve dependencies using the standard prerequisite-patch-id
+	[_] Define the prerequisite-change-id trailer
+	[_] Dependency chaining (within reason)
+
+v0.15
+-----
+[_] `b4 review` similar to `b4 prep`:
+	[_] Retrieve series and apply to a branch
+	[_] Use empty commit for cover letter and review state tracking
+	[_] Simple edit mode a-la "git rebase -i" that lets you apply trailers to patches
+
diff --git a/pyproject.toml b/pyproject.toml
index fe19036..83d730f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,52 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "b4"
+version = "0.14-dev"
+description = "A tool to work with public-inbox and patch archives"
+readme = "README.rst"
+keywords = ["git", "public-inbox", "lore.kernel.org", "patch", "email", "workflow"]
+license = {file = "COPYING"}
+authors = [
+    {name = "Konstantin Ryabitsev", email="konstantin@linuxfoundation.org"},
+]
+requires-python = ">=3.8"
+classifiers = [
+    "Environment :: Console",
+    "Operating System :: POSIX :: Linux",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)",
+    "Topic :: Communications :: Email",
+    "Topic :: Software Development",
+    "Topic :: Utilities",
+]
+dependencies = [
+    "requests>=2.24,<3.0",
+    "git-filter-repo>=2.30,<3.0",
+    "dkimpy>=1.0,<2.0",
+    "patatt>=0.6,<2.0",
+]
+
+[project.optional-dependencies]
+test = ["pytest"]
+
+[project.urls]
+Homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/"
+Repository = "https://git.kernel.org/pub/scm/utils/b4/b4.git"
+Documentation = "https://b4.docs.kernel.org/"
+
+[project.scripts]
+b4 = "b4.command:cmd"
+
 [tool.pytest.ini_options]
 filterwarnings = "ignore:.*(pyopenssl|invalid escape sequence).*:DeprecationWarning"
 norecursedirs = "tests/helpers"
+
+[tool.bumpversion]
+current_version = "0.14-dev"
+files = [
+    {filename = "src/b4/__init__.py"},
+    {filename = "src/man/b4.5.rst"},
+]
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 333f549..0000000
--- a/setup.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import re
-from setuptools import setup
-
-# Utility function to read the README file.
-# Used for the long_description.  It's nice, because now 1) we have a top level
-# README file and 2) it's easier to type in the README file than to put a raw
-# string in below ...
-
-
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
-
-def find_version(source):
-    version_file = read(source)
-    version_match = re.search(r"^__VERSION__ = ['\"]([^'\"]*)['\"]", version_file, re.M)
-    if version_match:
-        return version_match.group(1)
-    raise RuntimeError("Unable to find version string.")
-
-
-NAME = 'b4'
-
-setup(
-    version=find_version('b4/__init__.py'),
-    url='https://git.kernel.org/pub/scm/utils/b4/b4.git/tree/README.rst',
-    project_urls={
-        'Community': 'https://lore.kernel.org/tools'
-    },
-    name=NAME,
-    description='A tool to work with public-inbox and patch archives',
-    author='Konstantin Ryabitsev',
-    author_email='mricon@kernel.org',
-    packages=['b4'],
-    license='GPLv2+',
-    long_description=read('man/b4.5.rst'),
-    long_description_content_type='text/x-rst',
-    data_files=[('share/man/man5', ['man/b4.5'])],
-    keywords=['git', 'public-inbox', 'lore.kernel.org', 'patches'],
-    install_requires=[
-        'requests>=2.24,<3.0',
-        'dnspython>=2.1,<3.0',
-        'dkimpy>=1.0,<2.0',
-        'patatt>=0.6,<2.0',
-        'git-filter-repo>=2.30,<3.0',
-    ],
-    python_requires='>=3.8',
-    entry_points={
-        'console_scripts': [
-            'b4=b4.command:cmd'
-        ],
-    },
-)
diff --git a/b4/__init__.py b/src/b4/__init__.py
index ad77cee..ad77cee 100644
--- a/b4/__init__.py
+++ b/src/b4/__init__.py
diff --git a/b4/command.py b/src/b4/command.py
index be0f033..be0f033 100644
--- a/b4/command.py
+++ b/src/b4/command.py
diff --git a/b4/diff.py b/src/b4/diff.py
index 56ed013..56ed013 100644
--- a/b4/diff.py
+++ b/src/b4/diff.py
diff --git a/b4/ez.py b/src/b4/ez.py
index 3bf4e9c..3bf4e9c 100644
--- a/b4/ez.py
+++ b/src/b4/ez.py
diff --git a/b4/kr.py b/src/b4/kr.py
index eaab74a..eaab74a 100644
--- a/b4/kr.py
+++ b/src/b4/kr.py
diff --git a/man/b4.5 b/src/b4/man/b4.5
index e3cc3ce..e3cc3ce 100644
--- a/man/b4.5
+++ b/src/b4/man/b4.5
diff --git a/man/b4.5.rst b/src/b4/man/b4.5.rst
index 988ced4..7683145 100644
--- a/man/b4.5.rst
+++ b/src/b4/man/b4.5.rst
@@ -8,7 +8,7 @@ Work with code submissions in a public-inbox archive
 :Date:      2023-01-19
 :Copyright: The Linux Foundation and contributors
 :License:   GPLv2+
-:Version:   0.12.0
+:Version:   0.14-dev
 :Manual section: 5
 
 SYNOPSIS
diff --git a/b4/mbox.py b/src/b4/mbox.py
index 5b2c236..5b2c236 100644
--- a/b4/mbox.py
+++ b/src/b4/mbox.py
diff --git a/b4/pr.py b/src/b4/pr.py
index 2d0ce23..2d0ce23 100644
--- a/b4/pr.py
+++ b/src/b4/pr.py
diff --git a/shazam-merge-template.example b/src/b4/templates/shazam-merge-template.example
index e4d49d2..e4d49d2 100644
--- a/shazam-merge-template.example
+++ b/src/b4/templates/shazam-merge-template.example
diff --git a/thanks-am-template.example b/src/b4/templates/thanks-am-template.example
index b2c8986..b2c8986 100644
--- a/thanks-am-template.example
+++ b/src/b4/templates/thanks-am-template.example
diff --git a/thanks-pr-template.example b/src/b4/templates/thanks-pr-template.example
index 13bd205..13bd205 100644
--- a/thanks-pr-template.example
+++ b/src/b4/templates/thanks-pr-template.example
diff --git a/b4/ty.py b/src/b4/ty.py
index a8bdabf..a8bdabf 100644
--- a/b4/ty.py
+++ b/src/b4/ty.py
diff --git a/tests/__init__.py b/src/tests/__init__.py
index e69de29..e69de29 100644
--- a/tests/__init__.py
+++ b/src/tests/__init__.py
diff --git a/tests/conftest.py b/src/tests/conftest.py
index d2f68d8..d2f68d8 100644
--- a/tests/conftest.py
+++ b/src/tests/conftest.py
diff --git a/tests/samples/gitdir.bundle b/src/tests/samples/gitdir.bundle
index 00ac4e7..00ac4e7 100644
--- a/tests/samples/gitdir.bundle
+++ b/src/tests/samples/gitdir.bundle
diff --git a/tests/samples/gpg-badsig.txt b/src/tests/samples/gpg-badsig.txt
index d53e4cf..d53e4cf 100644
--- a/tests/samples/gpg-badsig.txt
+++ b/src/tests/samples/gpg-badsig.txt
diff --git a/tests/samples/gpg-good-invalid-notrust.txt b/src/tests/samples/gpg-good-invalid-notrust.txt
index e531d78..e531d78 100644
--- a/tests/samples/gpg-good-invalid-notrust.txt
+++ b/src/tests/samples/gpg-good-invalid-notrust.txt
diff --git a/tests/samples/gpg-good-valid-notrust.txt b/src/tests/samples/gpg-good-valid-notrust.txt
index aacb4f8..aacb4f8 100644
--- a/tests/samples/gpg-good-valid-notrust.txt
+++ b/src/tests/samples/gpg-good-valid-notrust.txt
diff --git a/tests/samples/gpg-good-valid-trusted.txt b/src/tests/samples/gpg-good-valid-trusted.txt
index 26e7914..26e7914 100644
--- a/tests/samples/gpg-good-valid-trusted.txt
+++ b/src/tests/samples/gpg-good-valid-trusted.txt
diff --git a/tests/samples/gpg-no-pubkey.txt b/src/tests/samples/gpg-no-pubkey.txt
index 5026191..5026191 100644
--- a/tests/samples/gpg-no-pubkey.txt
+++ b/src/tests/samples/gpg-no-pubkey.txt
diff --git a/tests/samples/save-7bit-clean.txt b/src/tests/samples/save-7bit-clean.txt
index 91865d6..91865d6 100644
--- a/tests/samples/save-7bit-clean.txt
+++ b/src/tests/samples/save-7bit-clean.txt
diff --git a/tests/samples/save-8bit-clean.txt b/src/tests/samples/save-8bit-clean.txt
index 246efe4..246efe4 100644
--- a/tests/samples/save-8bit-clean.txt
+++ b/src/tests/samples/save-8bit-clean.txt
diff --git a/tests/samples/sevenbitify-1.verify b/src/tests/samples/sevenbitify-1.verify
index 28ec511..28ec511 100644
--- a/tests/samples/sevenbitify-1.verify
+++ b/src/tests/samples/sevenbitify-1.verify
diff --git a/tests/samples/shazam-git1-just-series-defaults.verify b/src/tests/samples/shazam-git1-just-series-defaults.verify
index a7bffa7..a7bffa7 100644
--- a/tests/samples/shazam-git1-just-series-defaults.verify
+++ b/src/tests/samples/shazam-git1-just-series-defaults.verify
diff --git a/tests/samples/shazam-git1-just-series-merged.verify b/src/tests/samples/shazam-git1-just-series-merged.verify
index cf4f6f3..cf4f6f3 100644
--- a/tests/samples/shazam-git1-just-series-merged.verify
+++ b/src/tests/samples/shazam-git1-just-series-merged.verify
diff --git a/tests/samples/shazam-git1-just-series.mbox b/src/tests/samples/shazam-git1-just-series.mbox
index ef6a33a..ef6a33a 100644
--- a/tests/samples/shazam-git1-just-series.mbox
+++ b/src/tests/samples/shazam-git1-just-series.mbox
diff --git a/tests/samples/trailers-followup-bare-address-ref-defaults.txt b/src/tests/samples/trailers-followup-bare-address-ref-defaults.txt
index 7b1ebef..7b1ebef 100644
--- a/tests/samples/trailers-followup-bare-address-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-bare-address-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-bare-address.mbox b/src/tests/samples/trailers-followup-bare-address.mbox
index 8f5bbb8..8f5bbb8 100644
--- a/tests/samples/trailers-followup-bare-address.mbox
+++ b/src/tests/samples/trailers-followup-bare-address.mbox
diff --git a/tests/samples/trailers-followup-custody-ref-ordered.txt b/src/tests/samples/trailers-followup-custody-ref-ordered.txt
index be4d2ee..be4d2ee 100644
--- a/tests/samples/trailers-followup-custody-ref-ordered.txt
+++ b/src/tests/samples/trailers-followup-custody-ref-ordered.txt
diff --git a/tests/samples/trailers-followup-custody-ref-unordered.txt b/src/tests/samples/trailers-followup-custody-ref-unordered.txt
index 86b50e4..86b50e4 100644
--- a/tests/samples/trailers-followup-custody-ref-unordered.txt
+++ b/src/tests/samples/trailers-followup-custody-ref-unordered.txt
diff --git a/tests/samples/trailers-followup-custody-ref-with-ignored.txt b/src/tests/samples/trailers-followup-custody-ref-with-ignored.txt
index 11ccb7e..11ccb7e 100644
--- a/tests/samples/trailers-followup-custody-ref-with-ignored.txt
+++ b/src/tests/samples/trailers-followup-custody-ref-with-ignored.txt
diff --git a/tests/samples/trailers-followup-custody.mbox b/src/tests/samples/trailers-followup-custody.mbox
index 511c7a2..511c7a2 100644
--- a/tests/samples/trailers-followup-custody.mbox
+++ b/src/tests/samples/trailers-followup-custody.mbox
diff --git a/tests/samples/trailers-followup-name-parens-ref-defaults.txt b/src/tests/samples/trailers-followup-name-parens-ref-defaults.txt
index 06b8831..06b8831 100644
--- a/tests/samples/trailers-followup-name-parens-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-name-parens-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-name-parens.mbox b/src/tests/samples/trailers-followup-name-parens.mbox
index 0fe08d4..0fe08d4 100644
--- a/tests/samples/trailers-followup-name-parens.mbox
+++ b/src/tests/samples/trailers-followup-name-parens.mbox
diff --git a/tests/samples/trailers-followup-non-git-patch-ref-defaults.txt b/src/tests/samples/trailers-followup-non-git-patch-ref-defaults.txt
index 59d9b71..59d9b71 100644
--- a/tests/samples/trailers-followup-non-git-patch-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-non-git-patch-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-non-git-patch.mbox b/src/tests/samples/trailers-followup-non-git-patch.mbox
index 3bc722a..3bc722a 100644
--- a/tests/samples/trailers-followup-non-git-patch.mbox
+++ b/src/tests/samples/trailers-followup-non-git-patch.mbox
diff --git a/tests/samples/trailers-followup-nore-ref-defaults.txt b/src/tests/samples/trailers-followup-nore-ref-defaults.txt
index 9f78bd3..9f78bd3 100644
--- a/tests/samples/trailers-followup-nore-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-nore-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-nore.mbox b/src/tests/samples/trailers-followup-nore.mbox
index 27dddd6..27dddd6 100644
--- a/tests/samples/trailers-followup-nore.mbox
+++ b/src/tests/samples/trailers-followup-nore.mbox
diff --git a/tests/samples/trailers-followup-partial-reroll-ref-defaults.txt b/src/tests/samples/trailers-followup-partial-reroll-ref-defaults.txt
index 5f957e4..5f957e4 100644
--- a/tests/samples/trailers-followup-partial-reroll-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-partial-reroll-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-partial-reroll.mbox b/src/tests/samples/trailers-followup-partial-reroll.mbox
index 1f78553..1f78553 100644
--- a/tests/samples/trailers-followup-partial-reroll.mbox
+++ b/src/tests/samples/trailers-followup-partial-reroll.mbox
diff --git a/tests/samples/trailers-followup-single-ref-addlink.txt b/src/tests/samples/trailers-followup-single-ref-addlink.txt
index e0c4826..e0c4826 100644
--- a/tests/samples/trailers-followup-single-ref-addlink.txt
+++ b/src/tests/samples/trailers-followup-single-ref-addlink.txt
diff --git a/tests/samples/trailers-followup-single-ref-addmsgid.txt b/src/tests/samples/trailers-followup-single-ref-addmsgid.txt
index eeed03d..eeed03d 100644
--- a/tests/samples/trailers-followup-single-ref-addmsgid.txt
+++ b/src/tests/samples/trailers-followup-single-ref-addmsgid.txt
diff --git a/tests/samples/trailers-followup-single-ref-addmysob.txt b/src/tests/samples/trailers-followup-single-ref-addmysob.txt
index 31032ba..31032ba 100644
--- a/tests/samples/trailers-followup-single-ref-addmysob.txt
+++ b/src/tests/samples/trailers-followup-single-ref-addmysob.txt
diff --git a/tests/samples/trailers-followup-single-ref-copyccs.txt b/src/tests/samples/trailers-followup-single-ref-copyccs.txt
index 6fc2d0a..6fc2d0a 100644
--- a/tests/samples/trailers-followup-single-ref-copyccs.txt
+++ b/src/tests/samples/trailers-followup-single-ref-copyccs.txt
diff --git a/tests/samples/trailers-followup-single-ref-defaults.txt b/src/tests/samples/trailers-followup-single-ref-defaults.txt
index d65ffce..d65ffce 100644
--- a/tests/samples/trailers-followup-single-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-single-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-single-ref-noadd.txt b/src/tests/samples/trailers-followup-single-ref-noadd.txt
index cda0610..cda0610 100644
--- a/tests/samples/trailers-followup-single-ref-noadd.txt
+++ b/src/tests/samples/trailers-followup-single-ref-noadd.txt
diff --git a/tests/samples/trailers-followup-single-ref-ordered.txt b/src/tests/samples/trailers-followup-single-ref-ordered.txt
index 309be50..309be50 100644
--- a/tests/samples/trailers-followup-single-ref-ordered.txt
+++ b/src/tests/samples/trailers-followup-single-ref-ordered.txt
diff --git a/tests/samples/trailers-followup-single-ref-sloppy.txt b/src/tests/samples/trailers-followup-single-ref-sloppy.txt
index 4cb72dd..4cb72dd 100644
--- a/tests/samples/trailers-followup-single-ref-sloppy.txt
+++ b/src/tests/samples/trailers-followup-single-ref-sloppy.txt
diff --git a/tests/samples/trailers-followup-single.mbox b/src/tests/samples/trailers-followup-single.mbox
index f3f788f..f3f788f 100644
--- a/tests/samples/trailers-followup-single.mbox
+++ b/src/tests/samples/trailers-followup-single.mbox
diff --git a/tests/samples/trailers-followup-with-cover-ref-addlink.txt b/src/tests/samples/trailers-followup-with-cover-ref-addlink.txt
index cf58251..cf58251 100644
--- a/tests/samples/trailers-followup-with-cover-ref-addlink.txt
+++ b/src/tests/samples/trailers-followup-with-cover-ref-addlink.txt
diff --git a/tests/samples/trailers-followup-with-cover-ref-defaults.txt b/src/tests/samples/trailers-followup-with-cover-ref-defaults.txt
index 5ef0d7a..5ef0d7a 100644
--- a/tests/samples/trailers-followup-with-cover-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-with-cover-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-with-cover.mbox b/src/tests/samples/trailers-followup-with-cover.mbox
index f2c2c6d..f2c2c6d 100644
--- a/tests/samples/trailers-followup-with-cover.mbox
+++ b/src/tests/samples/trailers-followup-with-cover.mbox
diff --git a/tests/samples/trailers-followup-with-diffstat-ref-defaults.txt b/src/tests/samples/trailers-followup-with-diffstat-ref-defaults.txt
index 3555f6e..3555f6e 100644
--- a/tests/samples/trailers-followup-with-diffstat-ref-defaults.txt
+++ b/src/tests/samples/trailers-followup-with-diffstat-ref-defaults.txt
diff --git a/tests/samples/trailers-followup-with-diffstat.mbox b/src/tests/samples/trailers-followup-with-diffstat.mbox
index f1c0d31..f1c0d31 100644
--- a/tests/samples/trailers-followup-with-diffstat.mbox
+++ b/src/tests/samples/trailers-followup-with-diffstat.mbox
diff --git a/tests/samples/trailers-test-extinfo.txt b/src/tests/samples/trailers-test-extinfo.txt
index aa61e8d..aa61e8d 100644
--- a/tests/samples/trailers-test-extinfo.txt
+++ b/src/tests/samples/trailers-test-extinfo.txt
diff --git a/tests/samples/trailers-test-simple.txt b/src/tests/samples/trailers-test-simple.txt
index da64caf..da64caf 100644
--- a/tests/samples/trailers-test-simple.txt
+++ b/src/tests/samples/trailers-test-simple.txt
diff --git a/tests/samples/trailers-thread-with-cover-followup.mbox b/src/tests/samples/trailers-thread-with-cover-followup.mbox
index 5c4e64e..5c4e64e 100644
--- a/tests/samples/trailers-thread-with-cover-followup.mbox
+++ b/src/tests/samples/trailers-thread-with-cover-followup.mbox
diff --git a/tests/samples/trailers-thread-with-cover-followup.verify b/src/tests/samples/trailers-thread-with-cover-followup.verify
index acd6278..acd6278 100644
--- a/tests/samples/trailers-thread-with-cover-followup.verify
+++ b/src/tests/samples/trailers-thread-with-cover-followup.verify
diff --git a/tests/samples/trailers-thread-with-followups-and-tripledash.verify b/src/tests/samples/trailers-thread-with-followups-and-tripledash.verify
index 42d368f..42d368f 100644
--- a/tests/samples/trailers-thread-with-followups-and-tripledash.verify
+++ b/src/tests/samples/trailers-thread-with-followups-and-tripledash.verify
diff --git a/tests/samples/trailers-thread-with-followups.mbox b/src/tests/samples/trailers-thread-with-followups.mbox
index a267e0b..a267e0b 100644
--- a/tests/samples/trailers-thread-with-followups.mbox
+++ b/src/tests/samples/trailers-thread-with-followups.mbox
diff --git a/tests/samples/trailers-thread-with-followups.verify b/src/tests/samples/trailers-thread-with-followups.verify
index a623685..a623685 100644
--- a/tests/samples/trailers-thread-with-followups.verify
+++ b/src/tests/samples/trailers-thread-with-followups.verify
diff --git a/tests/samples/trailers-with-tripledash.bundle b/src/tests/samples/trailers-with-tripledash.bundle
index 24ae811..24ae811 100644
--- a/tests/samples/trailers-with-tripledash.bundle
+++ b/src/tests/samples/trailers-with-tripledash.bundle
diff --git a/tests/test___init__.py b/src/tests/test___init__.py
index 2fa454f..bf5e9b5 100644
--- a/tests/test___init__.py
+++ b/src/tests/test___init__.py
@@ -13,8 +13,8 @@ import io
     ('badsig', (False, False, False, 'B6C41CE35664996C', None)),
     ('no-pubkey', (False, False, False, None, None)),
 ])
-def test_check_gpg_status(source, expected):
-    with open(f'tests/samples/gpg-{source}.txt', 'r') as fh:
+def test_check_gpg_status(sampledir, source, expected):
+    with open(f'{sampledir}/gpg-{source}.txt', 'r') as fh:
         status = fh.read()
     assert b4.check_gpg_status(status) == expected
 
diff --git a/tests/test_ez.py b/src/tests/test_ez.py
index 1b02e7b..1b02e7b 100644
--- a/tests/test_ez.py
+++ b/src/tests/test_ez.py
diff --git a/tests/test_mbox.py b/src/tests/test_mbox.py
index 1065f0e..1065f0e 100644
--- a/tests/test_mbox.py
+++ b/src/tests/test_mbox.py