diff --git a/Makefile b/Makefile index 92181461..c0b9c3fe 100644 --- a/Makefile +++ b/Makefile @@ -120,5 +120,4 @@ endif @echo "--> Done installing new dependencies" @echo "" - .PHONY: develop dev-postgres dev-docs setup-git build clean update-submodules test testloop test-cli test-js test-python lint lint-python lint-js coverage publish release diff --git a/lemur/common/schema.py b/lemur/common/schema.py index 1e081f8c..940f267c 100644 --- a/lemur/common/schema.py +++ b/lemur/common/schema.py @@ -148,7 +148,7 @@ def validate_schema(input_schema, output_schema): request_data = request.get_json() else: request_data = request.args - + print(data) data, errors = input_schema.load(request_data) if errors: diff --git a/lemur/migrations/alembic.ini b/lemur/migrations/alembic.ini index f8ed4801..6c3428e7 100644 --- a/lemur/migrations/alembic.ini +++ b/lemur/migrations/alembic.ini @@ -8,7 +8,7 @@ # the 'revision' command, regardless of autogenerate # revision_environment = false - +script_location = . # Logging configuration [loggers] keys = root,sqlalchemy,alembic diff --git a/requirements-dev.txt b/requirements-dev.txt index f94fa610..9c2d4400 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -9,6 +9,8 @@ cached-property==1.4.2 # via pre-commit certifi==2018.1.18 # via requests cfgv==1.0.0 # via pre-commit chardet==3.0.4 # via requests +configparser==3.5.0 # via flake8 +enum34==1.1.6 # via flake8 flake8==3.5.0 identify==1.0.11 # via pre-commit idna==2.6 # via requests diff --git a/requirements-docs.txt b/requirements-docs.txt index a8b93db2..a11881c2 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -24,4 +24,5 @@ sphinx-rtd-theme==0.3.0 sphinx==1.7.2 sphinxcontrib-httpdomain==1.6.1 sphinxcontrib-websupport==1.0.1 # via sphinx +typing==3.6.4 # via sphinx urllib3==1.22 # via requests diff --git a/requirements-tests.txt b/requirements-tests.txt index 4113ad2a..5fb4a4dc 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -20,18 +20,22 @@ cryptography==2.2.2 # via moto docker-pycreds==0.2.2 # via docker docker==3.2.1 # via moto docutils==0.14 # via botocore +enum34==1.1.6 # via cryptography factory-boy==2.10.0 faker==0.8.13 flask==0.12.2 # via pytest-flask freezegun==0.3.10 +funcsigs==1.0.2 # via mock, pytest +futures==3.2.0 # via s3transfer idna==2.6 # via cryptography, requests +ipaddress==1.0.19 # via cryptography, docker, faker itsdangerous==0.24 # via flask jinja2==2.10 # via flask, moto jmespath==0.9.3 # via boto3, botocore jsondiff==1.1.1 # via moto jsonpickle==0.9.6 # via aws-xray-sdk markupsafe==1.0 # via jinja2 -mock==2.0.0 # via moto +mock==2.0.0 # via moto, pytest-mock more-itertools==4.1.0 # via pytest moto==1.3.1 nose==1.3.7 diff --git a/requirements.txt b/requirements.txt index 5e8ef031..2f7c9458 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,14 +10,17 @@ alembic==0.9.9 # via flask-migrate aniso8601==3.0.0 # via flask-restful arrow==0.12.1 asn1crypto==0.24.0 # via cryptography +backports.functools-lru-cache==1.5 # via arrow bcrypt==3.1.4 # via flask-bcrypt, paramiko blinker==1.4 # via flask-mail, flask-principal, raven boto3==1.7.4 botocore==1.10.4 # via boto3, s3transfer cffi==1.11.5 # via bcrypt, cryptography, pynacl click==6.7 # via flask +contextlib2==0.5.5 # via raven cryptography==2.2.2 docutils==0.14 # via botocore +enum34==1.1.6 # via cryptography flask-bcrypt==0.7.1 flask-cors==3.0.3 flask-mail==0.9.1 @@ -27,10 +30,13 @@ flask-restful==0.3.6 flask-script==2.0.6 flask-sqlalchemy==2.3.2 flask==0.12 +funcsigs==1.0.2 # via mock future==0.16.0 +futures==3.2.0 # via s3transfer gunicorn==19.7.1 idna==2.6 # via cryptography inflection==0.3.1 +ipaddress==1.0.19 # via cryptography itsdangerous==0.24 # via flask jinja2==2.10 jmespath==0.9.3 # via boto3, botocore