From f19054590b8d5b0fb1ba85280d1a37a4d6e8a3f1 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Sep 03 2021 14:50:47 +0000
Subject: Clean up dependencies and SPEC file


Signed-off-by: Merlin Mathesius <mmathesi@redhat.com>

---

diff --git a/fedora/python-calligrabot.spec b/fedora/python-calligrabot.spec
index 14c602b..ec5acf1 100644
--- a/fedora/python-calligrabot.spec
+++ b/fedora/python-calligrabot.spec
@@ -5,7 +5,7 @@ Summary:            A robosignatory driver for the CentOS Stream signing service
 
 License:            MIT
 URL:                https://pagure.io/calligrabot/
-Source0:            calligrabot-0.0.0.tar.gz
+Source0:            calligrabot-%{version}.tar.gz
 
 BuildArch:          noarch
 
@@ -25,14 +25,13 @@ A robosignatory driver for the CentOS Stream signing service.
 Summary: %summary
 Requires: koji
 Requires: python3-robosignatory >= 0.7.0
-Requires: python3-rpm-head-signing
 
 %description -n python3-calligrabot
 A robosignatory driver for the CentOS Stream signing service.
 
 
 %prep
-%setup -q -n calligrabot-0.0.0
+%setup -q -n calligrabot-%{version}
 # Remove bundled egg-info in case it exists
 rm -rf calligrabot.egg-info
 
@@ -46,7 +45,7 @@ rm -rf calligrabot.egg-info
 
 
 %check
-%{__python3} -m pytest -v
+%pytest
 
 
 %files -n python3-calligrabot
diff --git a/setup.py b/setup.py
index b2db582..a1204c3 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,6 @@
 
 import os
 import distutils
-import pkg_resources
 
 from setuptools import setup
 from setuptools.command.test import test
@@ -56,14 +55,6 @@ tests_require, _ = read_requirements(test_requirements_file)
 if _:
     deps_links.extend(_)
 
-# workaround for missing koji egg-info in EL8
-try:
-    pkg_resources.get_distribution("koji")
-except pkg_resources.DistributionNotFound:
-    pass
-else:
-    install_requires.append("koji")
-
 setup(
     name="calligrabot",
     version="0.0.1",
diff --git a/test-requirements.txt b/test-requirements.txt
index a9e8ad0..2e69563 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,3 @@
-incremental-progress
 koji
-pyasn1
 pytest
+rpm_head_signing