Merge pull request #109 from rekcurd/feature/remove-duplicated-ok

remove duplicated_ok
rekcurd · Jul 8, 2019 · 15ae44e · 15ae44e
2 parents 616bada + 16ab19f
commit 15ae44e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/rekcurd_dashboard/apis/api_evaluation.py b/rekcurd_dashboard/apis/api_evaluation.py
@@ -69,7 +69,6 @@ class ApiEvaluations(Resource):
     upload_parser = reqparse.RequestParser()
     upload_parser.add_argument('filepath', location='files', type=FileStorage, required=True)
     upload_parser.add_argument('description', location='form', type=str, required=True)
-    upload_parser.add_argument('duplicated_ok', location='form', type=bool, required=False, default=False)
 
     @evaluation_api_namespace.expect(upload_parser)
     @evaluation_api_namespace.marshal_with(eval_data_upload)

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Flask>=1.0.2 # BSD
+Flask==1.0.3 # BSD
 Flask-Cors>=3.0.4 # MIT
 grpcio>=1.13.0 # Apache-2.0
 grpcio-tools>=1.13.0 # Apache-2.0
@@ -8,7 +8,7 @@ PyYAML>=3.12 # MIT
 SQLAlchemy>=1.2.7 # MIT
 PyMySQL>=0.8.0 # MIT
 flask-sqlalchemy>=2.3.2 # BSD
-kubernetes>=v8.0.0 # Apache-2.0
+kubernetes>=v8.0.0,<10.0.0 # Apache-2.0
 flask-restplus>=0.11.0 # BSD-3-Clause
 Flask-Testing>=0.7.1 # BSD
 Flask-JWT-Simple>=0.0.3 # MIT

diff --git a/tox.ini b/tox.ini
@@ -9,7 +9,7 @@ deps = -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/requirements.txt
 commands =
    python -V
-   py.test -vvv -s --ignore=e2e_test
+   py.test -vvv -s --ignore=e2e_test --ignore=frontend
 # Patch for https://github.com/travis-ci/travis-ci/issues/7940
 setenv =
    BOTO_CONFIG = /dev/null