Test on PyPy 3.7 and Python 3.10 alpha 6

domdfcoding · domdfcoding · commit 76dc90e4d503 · 2021-03-16T23:20:22.000Z
diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: "windows-2019"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.6,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,8 +23,9 @@ jobs:
           - {python-version: "3.7", testenvs: "py37-attrs{19.3,20.1,20.2,latest},build", experimental: False}
           - {python-version: "3.8", testenvs: "py38-attrs{19.3,20.1,20.2,latest},build", experimental: False}
           - {python-version: "3.9", testenvs: "py39-attrs{19.3,20.1,20.2,latest},build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-attrs{19.3,20.1,20.2,latest},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy3-attrs{19.3,20.1,20.2,latest},build", experimental: False}
+          - {python-version: "3.10.0-alpha.6", testenvs: "py310-dev-attrs{19.3,20.1,20.2,latest},build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy36-attrs{19.3,20.1,20.2,latest},build", experimental: False}
+          - {python-version: "pypy-3.7", testenvs: "pypy37-attrs{19.3,20.1,20.2,latest},build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: "ubuntu-20.04"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.6,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,8 +23,9 @@ jobs:
           - {python-version: "3.7", testenvs: "py37-attrs{19.3,20.1,20.2,latest},build", experimental: False}
           - {python-version: "3.8", testenvs: "py38-attrs{19.3,20.1,20.2,latest},build", experimental: False}
           - {python-version: "3.9", testenvs: "py39-attrs{19.3,20.1,20.2,latest},build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-attrs{19.3,20.1,20.2,latest},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy3-attrs{19.3,20.1,20.2,latest},build", experimental: False}
+          - {python-version: "3.10.0-alpha.6", testenvs: "py310-dev-attrs{19.3,20.1,20.2,latest},build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy36-attrs{19.3,20.1,20.2,latest},build", experimental: False}
+          - {python-version: "pypy-3.7", testenvs: "pypy37-attrs{19.3,20.1,20.2,latest},build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: "macos-latest"
     continue-on-error: ${{ matrix.config.experimental }}
     env:
-      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.5,pypy-3.6'
+      USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.6,pypy-3.6,pypy-3.7'
 
     strategy:
       fail-fast: False
@@ -23,8 +23,9 @@ jobs:
           - {python-version: "3.7", testenvs: "py37-attrs{19.3,20.1,20.2,latest},build", experimental: False}
           - {python-version: "3.8", testenvs: "py38-attrs{19.3,20.1,20.2,latest},build", experimental: False}
           - {python-version: "3.9", testenvs: "py39-attrs{19.3,20.1,20.2,latest},build", experimental: False}
-          - {python-version: "3.10.0-alpha.5", testenvs: "py310-dev-attrs{19.3,20.1,20.2,latest},build", experimental: True}
-          - {python-version: "pypy-3.6", testenvs: "pypy3-attrs{19.3,20.1,20.2,latest},build", experimental: False}
+          - {python-version: "3.10.0-alpha.6", testenvs: "py310-dev-attrs{19.3,20.1,20.2,latest},build", experimental: True}
+          - {python-version: "pypy-3.6", testenvs: "pypy36-attrs{19.3,20.1,20.2,latest},build", experimental: False}
+          - {python-version: "pypy-3.7", testenvs: "pypy37-attrs{19.3,20.1,20.2,latest},build", experimental: True}
 
     steps:
       - name: Checkout 🛎️
diff --git a/attr_utils/docstrings.py b/attr_utils/docstrings.py
@@ -28,10 +28,12 @@
 
 # stdlib
 import re
+from types import MethodType
 from typing import Optional, Pattern, Type
 
 # 3rd party
-from domdf_python_tools.doctools import PYPY, base_new_docstrings, prettify_docstrings
+from domdf_python_tools.compat import PYPY37, PYPY
+from domdf_python_tools.doctools import base_new_docstrings, prettify_docstrings
 from domdf_python_tools.typing import MethodDescriptorType, MethodWrapperType, WrapperDescriptorType
 
 __all__ = ["add_attrs_doc"]
@@ -79,8 +81,20 @@ def add_attrs_doc(obj: Type) -> Type:
 
 		attribute = getattr(obj, attr_name)
 
-		if not PYPY and isinstance(attribute, (WrapperDescriptorType, MethodDescriptorType, MethodWrapperType)):
-			continue
+		if not PYPY and isinstance(
+				attribute,
+				(WrapperDescriptorType, MethodDescriptorType, MethodWrapperType, MethodType),
+				):
+			continue  # pragma: no cover (!PyPy)
+		elif PYPY and isinstance(attribute, MethodType):
+			continue  # pragma: no cover
+		elif PYPY37:  # pragma: no cover (not (PyPy and py37))
+			if attribute is getattr(object, attr_name, None):
+				continue
+			elif attribute is getattr(float, attr_name, None):
+				continue
+			elif attribute is getattr(str, attr_name, None):
+				continue
 
 		if attribute is None:
 			continue
diff --git a/repo_helper.yml b/repo_helper.yml
@@ -18,7 +18,8 @@ python_versions:
  - '3.8'
  - '3.9'
  - 3.10-dev
- - pypy3
+ - pypy36
+ - pypy37
 
 extras_require:
   sphinx:
diff --git a/tox.ini b/tox.ini
@@ -21,7 +21,8 @@ envlist =
     py38-attrs{19.3,20.1,20.2,latest}
     py39-attrs{19.3,20.1,20.2,latest}
     py310-dev-attrs{19.3,20.1,20.2,latest}
-    pypy3-attrs{19.3,20.1,20.2,latest}
+    pypy36-attrs{19.3,20.1,20.2,latest}
+    pypy37-attrs{19.3,20.1,20.2,latest}
     mypy
     build
 skip_missing_interpreters = True
@@ -38,7 +39,8 @@ test =
     py38-attrs{19.3,20.1,20.2,latest}
     py39-attrs{19.3,20.1,20.2,latest}
     py310-dev-attrs{19.3,20.1,20.2,latest}
-    pypy3-attrs{19.3,20.1,20.2,latest}
+    pypy36-attrs{19.3,20.1,20.2,latest}
+    pypy37-attrs{19.3,20.1,20.2,latest}
 qa = mypy, lint
 cov = py36-attrs19.3, coverage
 
