chore(python3): post integration tests fixes

fence/resources/google/utils.py

@@ -72,7 +72,7 @@ def get_or_create_primary_service_account_key(
     if user_service_account_key:
         fernet_key = Fernet(str(config["ENCRYPTION_KEY"]))
         private_key_bytes = fernet_key.decrypt(
-            str(user_service_account_key.private_key)
+            bytes(user_service_account_key.private_key, "utf-8")
         )
         sa_private_key = json.loads(private_key_bytes.decode("utf-8"))
     else:
@@ -140,7 +140,7 @@ def create_primary_service_account_key(user_id, username, proxy_group_id, expire
 
     fernet_key = Fernet(str(config["ENCRYPTION_KEY"]))
     private_key_bytes = json.dumps(sa_private_key).encode("utf-8")
-    private_key = fernet_key.encrypt(private_key_bytes)
+    private_key = fernet_key.encrypt(private_key_bytes).decode("utf-8")
 
     expires = expires or (
         int(time.time())

requirements.txt

@@ -18,7 +18,8 @@ Flask_OAuthlib==0.9.4
 flask-restful==0.3.6
 Flask_SQLAlchemy_Session==1.1
 gen3config==0.1.7
-gen3cirrus==0.4.0
+# gen3cirrus==0.4.0
+git+https://github.com/uc-cdis/cirrus.git@chore/python3#egg=gen3cirrus
 gen3users
 httplib2==0.10.3
 python-jose==2.0.2
@@ -40,5 +41,4 @@ git+https://[email protected]/uc-cdis/userdatamodel.git@chore/python3#egg=userdatam
 Werkzeug==0.12.2
 pyyaml==5.1
 retry==0.9.2
-git+https://github.com/uc-cdis/[email protected]#egg=flask_postgres_session-0.1.4
 git+https://github.com/uc-cdis/storage-client.git@chore/python3#egg=storageclient

setup.py

@@ -11,15 +11,14 @@
         "botocore>=1.7,<1.9.0",
         "boto3>=1.5,<1.6",
         "cached_property>=1.5.1,<2.0.0",
-        "gen3config>=0.1.6,<1.0.0",
-        "gen3cirrus>=0.3.4,<1.0.0",
         "cryptography>=2.1.2",
         "flask-restful>=0.3.6,<1.0.0",
         "Flask>=0.10.1,<1.0.0",
         "Flask-CORS>=3.0.3,<4.0.0",
         "Flask_OAuthlib>=0.9.4,<1.0.0",
         "Flask_SQLAlchemy_Session>=1.1,<2.0",
         "gen3cirrus>=0.4.0,<1.0",
+        "gen3config>=0.1.6,<1.0.0",
         "google_api_python_client>=1.6.4,<2.0.0",
         "httplib2>=0.10.3,<1.0.0",
         "python-jose>=2.0.0,<3.0.0",