python 2 is back again...for now...

setup.cfg

@@ -10,6 +10,7 @@ description-file = README.rst
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 classifier =
     Development Status :: 4 - Beta
+    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
 
@@ -38,8 +39,8 @@ packages =
 # Add here additional requirements for extra features, like:
 docker =
     docker
-secrets =
-    cryptography
+secure-config =
+    secure-config
 prometheus =
     prometheus-client
 

tests/test_integration/test_backend_behaviour.py

@@ -1,5 +1,5 @@
 import uuid
-
+import json
 import os
 import pytest
 
@@ -90,8 +90,9 @@ def delete_test_database_and_user(db_name, username, config):
 def parametrized_setup(request, tmpdir):
     from postgraas_server.management_resources import db
     cfg = tmpdir.join('config')
-    with open(cfg.strpath, "w", encoding="utf8") as fp:
+    with open(cfg.strpath, "w") as fp:
         json.dump(CONFIGS[request.param], fp)
+
     config = configuration.get_config(cfg.strpath)
     this_app = create_app(config)
     this_app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite://"

tests/test_integration/test_postgras_api.py

@@ -74,8 +74,9 @@ def delete_test_database_and_user(db_name, username, config):
 def parametrized_setup(request, tmpdir):
     from postgraas_server.management_resources import db
     cfg = tmpdir.join('config')
-    with open(cfg.strpath, "w", encoding="utf8") as fp:
+    with open(cfg.strpath, "w") as fp:
         json.dump(CONFIGS[request.param], fp)
+
     config = configuration.get_config(cfg.strpath)
     this_app = create_app(config)
     this_app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite://"
@@ -105,8 +106,9 @@ def parametrized_setup(request, tmpdir):
 def docker_setup(request, tmpdir):
     from postgraas_server.management_resources import db
     cfg = tmpdir.join('config')
-    with open(cfg.strpath, "w", encoding="utf8") as fp:
+    with open(cfg.strpath, "w") as fp:
         json.dump(CONFIGS['docker'], fp)
+
     this_app = create_app(configuration.get_config(cfg.strpath))
     this_app.config['SQLALCHEMY_DATABASE_URI'] = "sqlite://"
     this_app.use_reloader = False