Use Python 3.10 for CI

apragacz · Jul 29, 2023 · d957123 · d957123
1 parent fe6f6bf
commit d957123
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ orbs:
 executors:
   docker-executor:
     docker:
-      - image: apragacz/cimg-python:3.8
+      - image: cimg/python:3.10
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/requirements/requirements-base.lock.txt b/requirements/requirements-base.lock.txt
@@ -1,13 +1,11 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-base.lock.txt --resolver=backtracking
+#    pip-compile --output-file=requirements/requirements-base.lock.txt
 #
 asgiref==3.7.2
     # via django
-backports-zoneinfo==0.2.1
-    # via django
 django==4.2.3
     # via
     #   django-rest-registration (setup.py)

diff --git a/requirements/requirements-dev.lock.txt b/requirements/requirements-dev.lock.txt
@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-dev.lock.txt --resolver=backtracking requirements/requirements-dev.in requirements/requirements-test.lock.txt
+#    pip-compile --config=pyproject.toml --output-file=requirements/requirements-dev.lock.txt requirements/requirements-dev.in requirements/requirements-test.lock.txt
 #
 alabaster==0.7.13
     # via
@@ -26,10 +26,6 @@ babel==2.12.1
     #   sphinx
 backcall==0.2.0
     # via ipython
-backports-zoneinfo==0.2.1
-    # via
-    #   -r requirements/requirements-test.lock.txt
-    #   django
 bleach==6.0.0
     # via
     #   -r requirements/requirements-test.lock.txt
@@ -166,19 +162,14 @@ importlib-metadata==6.8.0
     # via
     #   -r requirements/requirements-test.lock.txt
     #   keyring
-    #   sphinx
     #   twine
-importlib-resources==6.0.0
-    # via
-    #   -r requirements/requirements-test.lock.txt
-    #   keyring
 iniconfig==2.0.0
     # via
     #   -r requirements/requirements-test.lock.txt
     #   pytest
 ipdb==0.13.13
     # via -r requirements/requirements-dev.in
-ipython==8.12.2
+ipython==8.14.0
     # via
     #   -r requirements/requirements-dev.in
     #   ipdb
@@ -312,7 +303,7 @@ pygments==2.15.1
     #   readme-renderer
     #   rich
     #   sphinx
-pylint==2.17.4
+pylint==2.17.5
     # via -r requirements/requirements-test.lock.txt
 pyproject-api==1.5.3
     # via
@@ -334,7 +325,6 @@ pytest-django==4.5.2
 pytz==2023.3
     # via
     #   -r requirements/requirements-test.lock.txt
-    #   babel
     #   djangorestframework
 readme-renderer[md]==40.0
     # via
@@ -482,10 +472,7 @@ typing-extensions==4.7.1
     #   django-stubs
     #   django-stubs-ext
     #   djangorestframework-stubs
-    #   ipython
     #   mypy
-    #   pylint
-    #   rich
 uritemplate==4.1.1
     # via
     #   -r requirements/requirements-test.lock.txt
@@ -517,7 +504,6 @@ zipp==3.16.2
     # via
     #   -r requirements/requirements-test.lock.txt
     #   importlib-metadata
-    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

diff --git a/requirements/requirements-test.lock.txt b/requirements/requirements-test.lock.txt
@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-test.lock.txt --resolver=backtracking requirements/requirements-base.lock.txt requirements/requirements-test.in
+#    pip-compile --config=pyproject.toml --output-file=requirements/requirements-test.lock.txt requirements/requirements-base.lock.txt requirements/requirements-test.in
 #
 alabaster==0.7.13
     # via sphinx
@@ -190,7 +190,7 @@ pygments==2.15.1
     #   readme-renderer
     #   rich
     #   sphinx
-pylint==2.17.4
+pylint==2.17.5
     # via -r requirements/requirements-test.in
 pyproject-api==1.5.3
     # via tox
@@ -208,7 +208,6 @@ pytest-django==4.5.2
 pytz==2023.3
     # via
     #   -r requirements/requirements-base.lock.txt
-    #   babel
     #   djangorestframework
 readme-renderer[md]==40.0
     # via
@@ -325,6 +324,10 @@ wheel==0.41.0
 wrapt==1.15.0
     # via astroid
 zipp==3.16.2
+<<<<<<< HEAD
     # via
     #   importlib-metadata
     #   importlib-resources
+=======
+    # via importlib-metadata
+>>>>>>> 0b2784c (Use Python 3.10 for CI)
diff --git a/rest_registration/utils/html.py b/rest_registration/utils/html.py
@@ -23,6 +23,14 @@ def __init__(self, preserve_urls: bool = False) -> None:
         self._tag_info_stack = deque([TagInfo(None, {})])
         self._preserve_urls = preserve_urls
 
+    def parse_marked_section(self, i, report=1):
+        try:
+            return super().parse_marked_section(i, report=report)
+        except AssertionError as exc:
+            # rephrase confusing assertion error introduced by:
+            # https://bugs.python.org/issue38573
+            raise ValueError(str(exc)) from exc
+
     def handle_starttag(self, tag: str, attrs: List[Tuple[str, Optional[str]]]) -> None:
         self._tag_info_stack.append(TagInfo(tag, dict(attrs)))
         if tag == 'br':