Merge pull request #133 from guokr/upgrade_pyyaml

upgrade pyyaml

Author: gusibi

requirements.txt

@@ -3,5 +3,6 @@ json-spec
 click<7
 jinja2
 dpath
-PyYAML==3.12
-flex
+jsonschema==2.6.0
+PyYAML==4.2b1
+swagger_spec_validator

swagger_py_codegen/_version.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "0.3.7"
+__version__ = "0.3.8"

swagger_py_codegen/command.py

@@ -15,8 +15,8 @@
 import yaml
 import click
 
-import flex
-from flex.exceptions import ValidationError
+from swagger_spec_validator import SwaggerValidationError
+from swagger_spec_validator.validator20 import validate_spec
 
 from ._version import __version__
 from .flask import FlaskGenerator
@@ -169,9 +169,9 @@ def generate(destination, swagger_doc, force=False, package=None,
     data = spec_load(swagger_doc)
     if validate:
         try:
-            flex.core.parse(data)
+            validate_spec(data)
             click.echo("Validation passed")
-        except ValidationError as e:
+        except SwaggerValidationError as e:
             raise click.ClickException(str(e))
     #print 'data             ',data
     swagger = Swagger(data)