Try to fix the CI (#65)

Author: joshuathompsonlindley

.gitignore

@@ -16,6 +16,7 @@ var/
 .installed.cfg
 *.egg
 *.manifest
+.DS_Store
 *.spec
 pip-log.txt
 pip-delete-this-directory.txt

ci/config/requirements.txt

@@ -1,24 +1,16 @@
-apispec-webframeworks==0.5.2
-apispec==6.0.2
-build==0.9.0
-decorator==5.1.1
-flake8==3.8.4
-flask-restful==0.3.9
-flex==6.14.1
-marshmallow==3.10.0
-mypy==0.942
-pep8==1.7.1
-pylint==2.15.8
-pytest-cov==4.0.0
-pytest==7.2.0
-safety==2.3.5
+build
+decorator
+flake8
+flask-restful
+flex
+marshmallow
+mypy
+pep8
+pylint
+pytest-cov
+pytest
+safety
 setuptools
-twine==4.0.2
-types-PyYAML==6.0.7
-types-six==1.16.21.4
-wheel==0.38.1
-babel==2.9.1
-twisted==22.10.0
-pyjwt==2.4.0
-oauthlib==3.2.1
+twine
+wheel
 -e .

ci/scripts/setup_worker.sh

@@ -9,4 +9,3 @@ REPO=$(dirname "$REPO../")
 
 python3 -m pip install --upgrade pip
 python3 -m pip install -r $REPO/ci/config/requirements.txt
-python3 -m pip install -r $REPO/requirements.txt

ci/tests/suite/test_lazy_string.py

@@ -10,23 +10,23 @@ requires-python = ">=3.6.1"
 authors = [{ name = "Overflow Digital", email = "[email protected]" }]
 maintainers = [
     { name = "Katerina Tiddy", email = "[email protected]" },
-    { name = "Joshua Thompson-Lindley", email = "[email protected]" }
+    { name = "Joshua Thompson-Lindley", email = "[email protected]" },
 ]
 description = "Next generation OpenAPI v3 Integration for Flask based APIs. Based on Flasgger."
 readme = "README.md"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6"
+    "Programming Language :: Python :: 3.6",
 ]
 keywords = ['flask', 'swagger', 'openapi', 'python', 'api', 'rest', 'openapi3']
 dependencies = [
     "Flask>=2.3.1",
     "PyYAML>=6.0",
-    "jsonschema>=4.17.3",
-    "mistune>=2.0.4",
-    "six>=1.16.0"
+    "jsonschema>=4.19.0",
+    "mistune>=3.0.0",
+    "six>=1.16.0",
 ]
 
 [project.urls]
@@ -55,7 +55,7 @@ include = ['flask_openapi*']
     "*.gif",
     "*.ico",
     "*.png",
-    "*.map"
+    "*.map",
 ]
 
 [tool.setuptools.dynamic]

pyproject.toml

@@ -8,11 +8,10 @@
 from .base import (
     BR_SANITIZER,
     Flasgger,
-    LazyJSONEncoder,  # noqa
     MK_SANITIZER,
     NO_SANITIZER,
     Swagger,
 )
 from .constants import OPTIONAL_FIELDS  # noqa
 from .marshmallow_apispec import APISpec, fields, Schema, SwaggerView  # noqa
-from .utils import apispec_to_template, LazyString, swag_from, validate  # noqa
+from .utils import apispec_to_template, swag_from, validate  # noqa

requirements.txt

@@ -21,7 +21,6 @@
     Blueprint,
     current_app,
     jsonify,
-    Markup,
     redirect,
     render_template,
     request,
@@ -31,6 +30,7 @@
 from json import JSONEncoder
 from flask.views import MethodView
 from werkzeug.datastructures import Authorization
+from markupsafe import Markup
 
 try:
     from flask_restful.reqparse import RequestParser
@@ -49,7 +49,6 @@
     get_specs,
     get_vendor_extension_fields,
     is_openapi3,
-    LazyString,
     parse_definition_docstring,
     parse_imports,
     swag_annotation,
@@ -978,10 +977,3 @@ def is_openapi3(self):
 
 # backwards compatibility
 Flasgger = Swagger  # noqa
-
-
-class LazyJSONEncoder(JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, LazyString):
-            return str(obj)
-        return super(LazyJSONEncoder, self).default(obj)

src/flask_openapi/__init__.py

@@ -927,48 +927,6 @@ def __ge__(self, other):
     def text_type(self):
         return text_type
 
-
-class LazyString(StringLike):
-    """
-    A lazy string *without* caching. The resulting string is regenerated for
-    every request.
-    """
-
-    def __init__(self, func):
-        """
-        Creates a `LazyString` object using `func` as the delayed closure.
-        `func` must return a string.
-        """
-        self._func = func
-
-    def __str__(self):
-        """
-        Returns the actual string.
-        """
-        return self.text_type(self._func())
-
-
-class CachedLazyString(LazyString):
-    """
-    A lazy string with caching.
-    """
-
-    def __init__(self, func):
-        """
-        Uses `__init__()` from the parent and initializes a cache.
-        """
-        super(CachedLazyString, self).__init__(func)
-        self._cache = None
-
-    def __str__(self):
-        """
-        Returns the actual string and caches the result.
-        """
-        if not self._cache:
-            self._cache = self.text_type(self._func())
-        return self._cache
-
-
 def swag_annotation(f):
     @wraps(f)
     def wrapper(*args, **kwargs):