Ignore schizophrenic flake8 error

Revert "Fix lint errors"
This reverts commit 9f60dc191a.
2018-11-29 02:24:03 +02:00 · 2018-11-29 02:23:31 +02:00 · 2018-11-29 02:18:58 +02:00 · 2018-11-29 02:12:32 +02:00 · 2018-11-29 01:38:40 +02:00 · 2018-11-29 01:27:27 +02:00
16 changed files with 152 additions and 100 deletions
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
@@ -3,6 +3,19 @@ Changelog
 #########


+**********
+**1.11.1**
+**********
+
+*Release date: Nov 29, 2018*
+
+- **IMPROVED:** updated ``swagger-ui`` to version 3.20.1
+- **IMPROVED:** updated ``ReDoc`` to version 2.0.0-alpha.41
+- **FIXED:** ``minLength`` and ``maxLength`` will now also work for ``ListSerializer`` in addition to ``ListField``
+- **FIXED:** ``MultipleChoiceField`` will now use the ``multi`` ``collectionFormat`` where appropriate (:issue:`257`)
+- **FIXED:** the ``format``, ``pattern``, ``enum``, ``min_length`` and ``max_length`` attributes of
+  ``coreschema.Schema`` will now be persited into the converted ``openapi.Parameter`` (:issue:`212`, :pr:`233`)
+
 **********
 **1.11.0**
 **********
@@ -4,9 +4,9 @@
  "lockfileVersion": 1,
  "dependencies": {
    "@babel/runtime": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz",
-      "integrity": "sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz",
+      "integrity": "sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==",
      "requires": {
        "regenerator-runtime": "^0.12.0"
      }
@@ -30,9 +30,9 @@
      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
    },
    "clipboard": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.1.tgz",
-      "integrity": "sha512-7yhQBmtN+uYZmfRjjVjKa0dZdWuabzpSKGtyQZN+9C8xlC788SSJjOHWh7tzurfwTqTD5UDYAhIv5fRJg3sHjQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz",
+      "integrity": "sha512-Vw26VSLRpJfBofiVaFb/I8PVfdI1OxKcYShe6fm0sP/DtmiWQNCjhM/okTvdCo0G+lMMm1rMYbk4IK4x1X+kgQ==",
      "optional": true,
      "requires": {
        "good-listener": "^1.2.2",
@@ -40,14 +40,6 @@
        "tiny-emitter": "^2.0.0"
      }
    },
-    "debug": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-      "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
    "decko": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/decko/-/decko-1.2.0.tgz",
@@ -113,9 +105,12 @@
      }
    },
    "hoist-non-react-statics": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
-      "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.0.tgz",
+      "integrity": "sha512-3IascCRfaEkbmHjJnUxWSspIUE1okLPjGTMVXW8zraUo1t3yg1BadKAxAGILHwgoBzmMnzrgeeaDGBvpuPz6dA==",
+      "requires": {
+        "react-is": "^16.3.2"
+      }
    },
    "js-tokens": {
      "version": "4.0.0",
@@ -140,14 +135,13 @@
      }
    },
    "json-schema-ref-parser": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-5.1.3.tgz",
-      "integrity": "sha512-CpDFlBwz/6la78hZxyB9FECVKGYjIIl3Ms3KLqFj99W7IIb7D00/RDgc++IGB4BBALl0QRhh5m4q5WNSopvLtQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-6.0.2.tgz",
+      "integrity": "sha512-EENU7mrmuBAdjSsAEJD8mMvodZyDhLBEfuSUBSIMuXqjs+cfMbFaxS8f6+ky675jetRzGzCdhzAU3y2VEtquvQ==",
      "requires": {
        "call-me-maybe": "^1.0.1",
-        "debug": "^3.1.0",
        "js-yaml": "^3.12.0",
-        "ono": "^4.0.6"
+        "ono": "^4.0.10"
      }
    },
    "loose-envify": {
@@ -159,9 +153,9 @@
      }
    },
    "lunr": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.3.tgz",
-      "integrity": "sha512-rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.5.tgz",
+      "integrity": "sha512-EtnfmHsHJTr3u24sito9JctSxej5Ds0SgUD2Lm+qRHyLgM7BGesFlW14eNh1mil0fV5Muh8gf3dBBXzADlUlzQ=="
    },
    "mark.js": {
      "version": "8.11.1",
@@ -169,14 +163,13 @@
      "integrity": "sha1-GA8fnr74sOY45BZq1S24eb6y/8U="
    },
    "marked": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.5.1.tgz",
-      "integrity": "sha512-iUkBZegCZou4AdwbKTwSW/lNDcz5OuRSl3qdcl31Ia0B2QPG0Jn+tKblh/9/eP9/6+4h27vpoh8wel/vQOV0vw=="
+      "version": "git+https://github.com/markedjs/marked.git#fb48827236ed3a43e611d2adb3c070ca3f55ed8e",
+      "from": "git+https://github.com/markedjs/marked.git#fb48827"
    },
    "memoize-one": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-4.0.2.tgz",
-      "integrity": "sha512-ucx2DmXTeZTsS4GPPUZCbULAN7kdPT1G+H49Y34JjbQ5ESc6OGhVxKvb1iKhr9v19ZB9OtnHwNnhUnNR/7Wteg=="
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-4.0.3.tgz",
+      "integrity": "sha512-QmpUu4KqDmX0plH4u+tf0riMc1KHE1+lw95cMrLlXQAFOx/xnBtwhZ52XJxd9X2O6kwKBqX32kmhbhlobD0cuw=="
    },
    "min-document": {
      "version": "2.19.0",
@@ -187,19 +180,14 @@
      }
    },
    "mobx-react": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.2.8.tgz",
-      "integrity": "sha512-VAkeqkrIpdoy3VPPoqvxjdQmcTT6hi7i3TsZSwcKbSrPbSTuWc7cp1EOiX/zV1wPWEuoNAQ22bCrskQwvdYTJA==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.2.tgz",
+      "integrity": "sha512-alSN0KDAAOb1OkYujfoJjjk0JWxWRKO4sLGB4hN2CuvaJMrlj7bhGQe7CBMJvEFNjtJRbhJcquYVjQ3rrH2zQQ==",
      "requires": {
-        "hoist-non-react-statics": "^2.5.0",
+        "hoist-non-react-statics": "^3.0.0",
        "react-lifecycles-compat": "^3.0.2"
      }
    },
-    "ms": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-    },
    "object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -227,9 +215,9 @@
      "integrity": "sha512-/2Sk/khljhdrsamjJYS5NjrH+GKEHEwh7zFSiYyxROyYKagkE4kSn2zDQDRTOMo8mpT2jikxx6yI1dG7lNP/hw=="
    },
    "polished": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/polished/-/polished-2.2.0.tgz",
-      "integrity": "sha512-GEKeNET1XIri53xKpFwGZX4fh2k3b5GE5fxwLWYYR2sGWkMAHJVcb7bK1g6QHIDcoIEEGC8CzHOQgl2qFByd3w==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/polished/-/polished-2.3.0.tgz",
+      "integrity": "sha512-G2yD9LhJy5HBuU+Im5qe70ubaJI/ZTTOIJO6GRMwJ2WSoAiPzlm8+LjAXMnm9/K0E0NumRVHvQu2HHPKQSYQjw==",
      "requires": {
        "@babel/runtime": "^7.0.0"
      }
@@ -265,9 +253,9 @@
      }
    },
    "react-hot-loader": {
-      "version": "4.3.11",
-      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.11.tgz",
-      "integrity": "sha512-T0G5jURyTsFLoiW6MTr5Q35UHC/B2pmYJ7+VBjk8yMDCEABRmCGy4g6QwxoB4pWg4/xYvVTa/Pbqnsgx/+NLuA==",
+      "version": "4.3.12",
+      "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.12.tgz",
+      "integrity": "sha512-GMM4TsqUVss2QPe+Y33NlgydA5/+7tAVQxR0rZqWvBpapM8JhD7p6ymMwSZzr5yxjoXXlK/6P6qNQBOqm1dqdg==",
      "requires": {
        "fast-levenshtein": "^2.0.6",
        "global": "^4.3.0",
@@ -275,8 +263,20 @@
        "prop-types": "^15.6.1",
        "react-lifecycles-compat": "^3.0.4",
        "shallowequal": "^1.0.2"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+        }
      }
    },
+    "react-is": {
+      "version": "16.6.3",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.6.3.tgz",
+      "integrity": "sha512-u7FDWtthB4rWibG/+mFbVd5FvdI20yde86qKGx4lVUTWmPlSWQ4QxbBIrrs+HnXGbxOUlUzTAP/VDmvCwaP2yA=="
+    },
    "react-lifecycles-compat": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
@@ -292,19 +292,19 @@
      }
    },
    "redoc": {
-      "version": "2.0.0-alpha.40",
-      "resolved": "https://registry.npmjs.org/redoc/-/redoc-2.0.0-alpha.40.tgz",
-      "integrity": "sha512-qc6wmw97a1Yh7LAqlF3BEVp8ualHaGjGLnsRL2O8BScqVmhFgyeAkFqayHdaT7qe5/g5Bge090U6Eq5OyvXi2Q==",
+      "version": "2.0.0-alpha.41",
+      "resolved": "https://registry.npmjs.org/redoc/-/redoc-2.0.0-alpha.41.tgz",
+      "integrity": "sha512-g8XnoDRRNLq2GVk8cNYKtO6cK5cPK95qdCIc6PSNo2ueBVWEQBKooriSF57B6GVuaqoOBacqlGHQDPakvBQLYA==",
      "requires": {
        "classnames": "^2.2.6",
        "decko": "^1.2.0",
        "dompurify": "^1.0.7",
        "eventemitter3": "^3.0.0",
        "json-pointer": "^0.6.0",
-        "json-schema-ref-parser": "^5.1.2",
+        "json-schema-ref-parser": "^6.0.1",
        "lunr": "^2.3.2",
        "mark.js": "^8.11.1",
-        "marked": "^0.5.1",
+        "marked": "git+https://github.com/markedjs/marked.git#fb48827236ed3a43e611d2adb3c070ca3f55ed8e",
        "memoize-one": "^4.0.0",
        "mobx-react": "^5.2.5",
        "openapi-sampler": "1.0.0-beta.14",
@@ -337,9 +337,9 @@
      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
    },
    "slugify": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.1.tgz",
-      "integrity": "sha512-6BwyhjF5tG5P8s+0DPNyJmBSBePG6iMyhjvIW5zGdA3tFik9PtK+yNkZgTeiroCRGZYgkHftFA62tGVK1EI9Kw=="
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.3.tgz",
+      "integrity": "sha512-aFvcXobuowA7RqU4IBVJvqmhkREDIqsj4oIJKk6JuZ5EO1PCwtAAwDCl8TdsMs4J9zCoDAVkB9FLUElDjNcRSg=="
    },
    "sprintf-js": {
      "version": "1.0.3",
@@ -352,9 +352,9 @@
      "integrity": "sha1-OUE/7p0CXHSn5ZzuyyN4TMDxfwI="
    },
    "swagger-ui-dist": {
-      "version": "3.19.3",
-      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.19.3.tgz",
-      "integrity": "sha512-bHH4yJrOpNCxLPqoEx2ZdwSuLMmc+V3JmFM9oetqWKKRv9AgUnrO1XNhePe9uc53QPaeJ0nCf3cLCxJBle6hjA=="
+      "version": "3.20.1",
+      "resolved": "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.20.1.tgz",
+      "integrity": "sha512-iqFNNmJWH24leUj/ohS5iZTHLZSPZse8c9F+WSCMi6ZJcRBgYKcT413c8BR5BEdKvU1kkIwvYy7C8DOjTRq9hQ=="
    },
    "tiny-emitter": {
      "version": "2.0.2",
@@ -1,8 +1,8 @@
 {
  "name": "drf-yasg",
  "dependencies": {
-    "redoc": "^2.0.0-alpha.40",
-    "swagger-ui-dist": "^3.19.3"
+    "redoc": "^2.0.0-alpha.41",
+    "swagger-ui-dist": "^3.20.1"
  },
  "repository": {
    "type": "git",
@@ -322,8 +322,8 @@ limit_validators = [
    (validators.MaxLengthValidator, serializers.CharField, 'max_length', operator.__lt__),

    # minItems and maxItems apply to lists
-    (validators.MinLengthValidator, serializers.ListField, 'min_items', operator.__gt__),
-    (validators.MaxLengthValidator, serializers.ListField, 'max_items', operator.__lt__),
+    (validators.MinLengthValidator, (serializers.ListField, serializers.ListSerializer), 'min_items', operator.__gt__),
+    (validators.MaxLengthValidator, (serializers.ListField, serializers.ListSerializer), 'max_items', operator.__lt__),
 ]


@@ -597,16 +597,22 @@ class ChoiceFieldInspector(FieldInspector):
                    if model_type:
                        enum_type = model_type.get('type', enum_type)

+            enum_values = list(field.choices.keys())
            if isinstance(field, serializers.MultipleChoiceField):
-                return SwaggerType(
+                result = SwaggerType(
                    type=openapi.TYPE_ARRAY,
                    items=ChildSwaggerType(
                        type=enum_type,
-                        enum=list(field.choices.keys())
+                        enum=enum_values
                    )
                )
+                if swagger_object_type == openapi.Parameter:
+                    if result['in'] in (openapi.IN_FORM, openapi.IN_QUERY):
+                        result.collection_format = 'multi'
+            else:
+                result = SwaggerType(type=enum_type, enum=enum_values)

-            return SwaggerType(type=enum_type, enum=list(field.choices.keys()))
+            return result

        return NotHandled

@@ -44,12 +44,16 @@ class CoreAPICompatInspector(PaginatorInspector, FilterInspector):
            coreschema.String: openapi.TYPE_STRING,
            coreschema.Boolean: openapi.TYPE_BOOLEAN,
        }
+
+        coreschema_attrs = ['format', 'pattern', 'enum', 'min_length', 'max_length']
+        schema = field.schema
        return openapi.Parameter(
            name=field.name,
            in_=location_to_in[field.location],
-            type=coreapi_types.get(type(field.schema), openapi.TYPE_STRING),
            required=field.required,
-            description=force_real_str(field.schema.description) if field.schema else None,
+            description=force_real_str(schema.description) if schema else None,
+            type=coreapi_types.get(type(schema), openapi.TYPE_STRING),
+            **OrderedDict((attr, getattr(schema, attr, None)) for attr in coreschema_attrs)
        )


@@ -36,7 +36,7 @@ class SwaggerAutoSchema(ViewInspector):
        description = self.get_description()
        summary = self.get_summary()
        security = self.get_security()
-        assert security is None or isinstance(security, list), "security must be a list of securiy requirement objects"
+        assert security is None or isinstance(security, list), "security must be a list of security requirement objects"
        deprecated = self.is_deprecated()
        tags = self.get_tags(operation_keys)

@@ -81,3 +81,4 @@ class UserSerializerrr(serializers.ModelSerializer):
 class UserListQuerySerializer(serializers.Serializer):
    username = serializers.CharField(help_text="this field is generated from a query_serializer", required=False)
    is_staff = serializers.BooleanField(help_text="this one too!", required=False)
+    styles = serializers.MultipleChoiceField(help_text="and this one is fancy!", choices=('a', 'b', 'c', 'd'))
@@ -740,6 +740,19 @@ paths:
          description: this one too!
          required: false
          type: boolean
+        - name: styles
+          in: query
+          description: and this one is fancy!
+          required: true
+          type: array
+          items:
+            type: string
+            enum:
+              - a
+              - b
+              - c
+              - d
+          collectionFormat: multi
      responses:
        '200':
          description: ''
@@ -1159,6 +1172,7 @@ definitions:
              - fan
              - fancy
              - felix
+              - fennel
              - fish
              - flatline
              - forth
@@ -1184,6 +1198,7 @@ definitions:
              - haskell
              - haxeml
              - hexdump
+              - hlsl
              - hsail
              - html
              - html+cheetah
@@ -1450,6 +1465,7 @@ definitions:
              - xml+php
              - xml+smarty
              - xml+velocity
+              - xorg.conf
              - xquery
              - xslt
              - xtend
@@ -50,7 +50,7 @@ addopts = -n 2 --ignore=node_modules
 [flake8]
 max-line-length = 120
 exclude = **/migrations/*
-ignore = F405
+ignore = F405,W504

 [isort]
 skip = .eggs,.tox,docs,env,venv,node_modules
Author	SHA1	Message	Date
Cristi Vîjdea	161a2e1b89	Ignore schizophrenic flake8 error	2018-11-29 02:24:03 +02:00
Cristi Vîjdea	a2bf515cc9	Revert "Fix lint errors" This reverts commit `9f60dc191a`.	2018-11-29 02:23:31 +02:00
Cristi Vîjdea	10a32f977c	Add 1.11.1 changelog	2018-11-29 02:18:58 +02:00
Cristi Vîjdea	6b5022cd7d	Use some more coreschema attributes in CoreAPICompatInspector Closes #212. Closes #233.	2018-11-29 02:12:32 +02:00
Cristi Vîjdea	708e70a526	Use collectionFormat=multi for MultiChoiceField in query and formData Fixes #257.	2018-11-29 01:38:40 +02:00
Cristi Vîjdea	9f60dc191a	Fix lint errors	2018-11-29 01:27:27 +02:00
Cristi Vîjdea	a2b35f3363	Update swagger-ui to 3.20.1 and ReDoc to 2.0.0-alpha.41	2018-11-29 01:22:49 +02:00
Cristi Vîjdea	754ec8a779	Enable minLength and maxLength for ListSerializer	2018-11-29 00:32:31 +02:00
Randall Wang	3cd93bd572	Fix typo (#252 )	2018-11-16 13:53:19 +02:00
Cristi Vîjdea	c5f6a79cc8	Fix heroku build	2018-10-14 21:44:32 +03:00