wapiti: remove condition for importlib-metadata

This commit is contained in:
Fabian Affolter 2022-07-03 13:16:53 +02:00
parent fe04d2c054
commit 07729dfccf

View file

@ -15,10 +15,6 @@ python3.pkgs.buildPythonApplication rec {
sha256 = "sha256-nGAG+7FqEktc55i5Q2urKh52vm/i6kX4kvS2AVUAUjA="; sha256 = "sha256-nGAG+7FqEktc55i5Q2urKh52vm/i6kX4kvS2AVUAUjA=";
}; };
nativeBuildInputs = with python3.pkgs; [
pytest-runner
];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
aiocache aiocache
aiosqlite aiosqlite
@ -30,6 +26,7 @@ python3.pkgs.buildPythonApplication rec {
httpcore httpcore
httpx httpx
humanize humanize
importlib-metadata
loguru loguru
Mako Mako
markupsafe markupsafe
@ -37,10 +34,8 @@ python3.pkgs.buildPythonApplication rec {
sqlalchemy sqlalchemy
tld tld
yaswfp yaswfp
] ++ lib.optionals (python3.pythonOlder "3.8") [
importlib-metadata
] ++ httpx.optional-dependencies.brotli ] ++ httpx.optional-dependencies.brotli
++ httpx.optional-dependencies.socks; ++ httpx.optional-dependencies.socks;
checkInputs = with python3.pkgs; [ checkInputs = with python3.pkgs; [
respx respx
@ -51,6 +46,8 @@ python3.pkgs.buildPythonApplication rec {
postPatch = '' postPatch = ''
# Ignore pinned versions # Ignore pinned versions
sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py
substituteInPlace setup.py \
--replace '"pytest-runner"' ""
substituteInPlace setup.cfg \ substituteInPlace setup.cfg \
--replace " --cov --cov-report=xml" "" --replace " --cov --cov-report=xml" ""
''; '';
@ -119,8 +116,9 @@ python3.pkgs.buildPythonApplication rec {
# TypeError: Expected bytes or bytes-like object got: <class 'str'> # TypeError: Expected bytes or bytes-like object got: <class 'str'>
"test_persister_upload" "test_persister_upload"
]; ];
disabledTestPaths = [ disabledTestPaths = [
# requires sslyze # Requires sslyze which is obsolete and was removed
"tests/attack/test_mod_ssl.py" "tests/attack/test_mod_ssl.py"
]; ];