Merge branch 'master' into dgreisen/get_file

CHANGELOG.md

@@ -17,8 +17,10 @@ and this project adheres to [Semantic Versioning][semver].
 
 
 ### Fixed
+- pytest works when taf installed via wheel ([200])
 
-[207]: https://github.com/openlawlibrary/taf/pull/207x
+[207]: https://github.com/openlawlibrary/taf/pull/207
+[200]: https://github.com/openlawlibrary/taf/pull/200
 
 ## [0.14.0] - 01/25/2022
 

setup.py

@@ -1,4 +1,5 @@
 from setuptools import find_packages, setup
+from importlib.util import find_spec
 
 PACKAGE_NAME = "taf"
 VERSION = "0.14.0"
@@ -42,22 +43,22 @@ def finalize_options(self):
 
 yubikey_require = ["yubikey-manager==3.0.0"]
 
-setup(
-    name=PACKAGE_NAME,
-    version=VERSION,
-    description=DESCRIPTION,
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url=URL,
-    author=AUTHOR,
-    author_email=AUTHOR_EMAIL,
-    keywords=KEYWORDS,
-    packages=packages,
-    cmdclass={"bdist_wheel": bdist_wheel},
-    include_package_data=True,
-    data_files=[("lib/site-packages/taf", ["./LICENSE.txt", "./README.md"])],
-    zip_safe=False,
-    install_requires=[
+kwargs = {
+    "name": PACKAGE_NAME,
+    "version": VERSION,
+    "description": DESCRIPTION,
+    "long_description": long_description,
+    "long_description_content_type": "text/markdown",
+    "url": URL,
+    "author": AUTHOR,
+    "author_email": AUTHOR_EMAIL,
+    "keywords": KEYWORDS,
+    "packages": packages,
+    "cmdclass": {"bdist_wheel": bdist_wheel},
+    "include_package_data": True,
+    "data_files": [("lib/site-packages/taf", ["./LICENSE.txt", "./README.md"])],
+    "zip_safe": False,
+    "install_requires": [
         "click==7.1",
         "colorama>=0.3.9",
         "oll-tuf==0.11.2.dev9",
@@ -66,21 +67,21 @@ def finalize_options(self):
         "pyOpenSSL==20.0.1",
         "pygit2==0.28.2",
     ],
-    extras_require={
+    "extras_require": {
         "ci": ci_require,
         "test": tests_require,
         "dev": dev_require,
         "yubikey": yubikey_require,
     },
-    tests_require=tests_require,
-    entry_points={
+    "tests_require": tests_require,
+    "entry_points": {
         "console_scripts": [
             "taf = taf.tools.cli.taf:main",
             "olc = taf.tools.cli.olc:main",
         ],
         "pytest11": ["taf_yubikey_utils = taf.tests.yubikey_utils"],
     },
-    classifiers=[
+    "classifiers": [
         "Development Status :: 2 - Pre-Alpha",
         "Intended Audience :: Developers",
         "Intended Audience :: Information Technology",
@@ -92,4 +93,16 @@ def finalize_options(self):
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
-)
+}
+
+
+try:
+    tests_exist = find_spec("taf.tests")
+except ModuleNotFoundError:
+    tests_exist = False
+if tests_exist:
+    kwargs["entry_points"]["pytest11"] = (
+        ["taf_yubikey_utils = taf.tests.yubikey_utils"],
+    )
+
+setup(**kwargs)