Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions allure-pytest/setup.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import os
import sys
from importlib.metadata import PackageNotFoundError, distribution
from setuptools import setup
from pkg_resources import require, DistributionNotFound, VersionConflict

try:
require("pytest-allure-adaptor")
distribution("pytest-allure-adaptor")
print("""
You have pytest-allure-adaptor installed.
You need to remove pytest-allure-adaptor from your site-packages
before installing allure-pytest, or conflicts may result.
""")
sys.exit()
except (DistributionNotFound, VersionConflict):
except PackageNotFoundError:
pass

PACKAGE = "allure-pytest"
Expand All @@ -33,19 +33,16 @@
"Programming Language :: Python :: 3.13",
]

setup_requires = [
"setuptools_scm"
]
setup_requires = ["setuptools_scm"]


install_requires = [
"pytest>=4.5.0"
]
install_requires = ["pytest>=4.5.0"]


def prepare_version():
from setuptools_scm import get_version
configuration = {"root": "..", "relative_to": __file__}

configuration = {"root": "..", "relative_to": __file__}
version = get_version(**configuration)
install_requires.append(f"allure-python-commons=={version}")
return configuration
Expand Down Expand Up @@ -76,8 +73,9 @@ def main():
package_dir={"allure_pytest": "src"},
entry_points={"pytest11": ["allure_pytest = allure_pytest.plugin"]},
setup_requires=setup_requires,
install_requires=install_requires
install_requires=install_requires,
)


if __name__ == "__main__":
main()
1 change: 1 addition & 0 deletions allure-python-commons/src/allure_commons/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def __init__(self, mime_type, extension):
URI_LIST = ("text/uri-list", "uri")

HTML = ("text/html", "html")
MARKDOWN = ("text/markdown", "md")
XML = ("application/xml", "xml")
JSON = ("application/json", "json")
YAML = ("application/yaml", "yaml")
Expand Down
Loading