python3-mccabe: update to 0.7.0.

2022-01-24 11:45:24 +01:00 · 2022-01-24 11:45:24 +01:00 · 02faba854b
parent 6229baa5b9
commit 02faba854b
2 changed files with 99 additions and 7 deletions
--- a/srcpkgs/python3-mccabe/patches/no-hypothesmith.patch
+++ b/srcpkgs/python3-mccabe/patches/no-hypothesmith.patch
@ -0,0 +1,96 @@
+From 0e24f74b0fd458170237eea62d0eff5ed0493a37 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 24 Jan 2022 11:01:59 +0100
+Subject: [PATCH] Fix handling missing hypothesmith gracefully
+
+Fix test_mccabe not to fail to import if hypothesmith is not available.
+While the original code seems to attempt to handle missing hypothesmith,
+the file fails with NameError without it.  This is because hypothesis
+decorators are used in global scope.  Guard the whole test function
+to be defined only when hypothesmith is available.
+---
+ test_mccabe.py | 70 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 36 insertions(+), 34 deletions(-)
+
+diff --git a/test_mccabe.py b/test_mccabe.py
+index fe6e8d3..5f07d32 100644
+--- a/test_mccabe.py
+++ b/test_mccabe.py
+@@ -239,41 +239,43 @@ def test_get_module_complexity(self):
+         self.assertEqual(0, mccabe.get_module_complexity("mccabe.py"))
+ 
+ 
+-# This test uses the Hypothesis and Hypothesmith libraries to generate random
+-# syntatically-valid Python source code and applies McCabe on it.
+-@settings(
+-    max_examples=1000,  # roughly 1k tests/minute, or half that under coverage
+-    derandomize=False,  # deterministic mode to avoid CI flakiness
+-    deadline=None,  # ignore Hypothesis' health checks; we already know that
+-    suppress_health_check=HealthCheck.all(),  # this is slow and filter-heavy.
+-)
+-@given(
+-    # Note that while Hypothesmith might generate code unlike that written by
+-    # humans, it's a general test that should pass for any *valid* source code.
+-    # (so e.g. running it against code scraped of the internet might also help)
+-    src_contents=hypothesmith.from_grammar() | hypothesmith.from_node(),
+-    max_complexity=st.integers(min_value=1),
+-)
+-@pytest.mark.skipif(not hypothesmith, reason="hypothesmith could not be imported")
+-def test_idempotent_any_syntatically_valid_python(
+-    src_contents: str, max_complexity: int
+-) -> None:
+-    """Property-based tests for mccabe.
+-
+-    This test case is based on a similar test for Black, the code formatter.
+-    Black's test was written by Zac Hatfield-Dodds, the author of Hypothesis
+-    and the Hypothesmith tool for source code generation.  You can run this
+-    file with `python`, `pytest`, or (soon) a coverage-guided fuzzer Zac is
+-    working on.
+-    """
+-
+-    # Before starting, let's confirm that the input string is valid Python:
+-    compile(src_contents, "<string>", "exec")  # else bug is in hypothesmith
+-
+-    # Then try to apply get_complexity_number to the code...
+-    get_code_complexity(src_contents, max_complexity)
+if hypothesmith is not None:
+    # This test uses the Hypothesis and Hypothesmith libraries to generate random
+    # syntatically-valid Python source code and applies McCabe on it.
+    @settings(
+        max_examples=1000,  # roughly 1k tests/minute, or half that under coverage
+        derandomize=False,  # deterministic mode to avoid CI flakiness
+        deadline=None,  # ignore Hypothesis' health checks; we already know that
+        suppress_health_check=HealthCheck.all(),  # this is slow and filter-heavy.
+    )
+    @given(
+        # Note that while Hypothesmith might generate code unlike that written by
+        # humans, it's a general test that should pass for any *valid* source code.
+        # (so e.g. running it against code scraped of the internet might also help)
+        src_contents=hypothesmith.from_grammar() | hypothesmith.from_node(),
+        max_complexity=st.integers(min_value=1),
+    )
+    @pytest.mark.skipif(not hypothesmith, reason="hypothesmith could not be imported")
+    def test_idempotent_any_syntatically_valid_python(
+        src_contents: str, max_complexity: int
+    ) -> None:
+        """Property-based tests for mccabe.
+
+        This test case is based on a similar test for Black, the code formatter.
+        Black's test was written by Zac Hatfield-Dodds, the author of Hypothesis
+        and the Hypothesmith tool for source code generation.  You can run this
+        file with `python`, `pytest`, or (soon) a coverage-guided fuzzer Zac is
+        working on.
+        """
+
+        # Before starting, let's confirm that the input string is valid Python:
+        compile(src_contents, "<string>", "exec")  # else bug is in hypothesmith
+
+        # Then try to apply get_complexity_number to the code...
+        get_code_complexity(src_contents, max_complexity)
+ 
+ 
+ if __name__ == "__main__":
+-    test_idempotent_any_syntatically_valid_python()
+    if hypothesmith is not None:
+        test_idempotent_any_syntatically_valid_python()
+     unittest.main()
--- a/srcpkgs/python3-mccabe/template
+++ b/srcpkgs/python3-mccabe/template
@ -1,7 +1,7 @@
 # Template file for 'python3-mccabe'
 pkgname=python3-mccabe
-version=0.6.1
-revision=7
+version=0.7.0
+revision=1
 wrksrc="mccabe-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@ -12,13 +12,9 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/PyCQA/mccabe"
 distfiles="${PYPI_SITE}/m/mccabe/mccabe-${version}.tar.gz"
-checksum=dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f
+checksum=348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325
 replaces="mccabe>=0"

-pre_build() {
-	vsed -i '/setup_requires=/d' setup.py
-}
-
 post_install() {
 	vlicense LICENSE
 }