fix

.secrets.baseline

@@ -118,7 +118,7 @@
         "filename": "pyproject.toml",
         "hashed_secret": "5206990aff0728d3e6b1f1670665007cbe6ab78e",
         "is_verified": false,
-        "line_number": 46
+        "line_number": 47
       }
     ],
     "sheepdog/dev_settings.py": [
@@ -327,5 +327,5 @@
       }
     ]
   },
-  "generated_at": "2023-01-26T23:32:07Z"
+  "generated_at": "2023-01-27T16:31:27Z"
 }

pyproject.toml

@@ -1,3 +1,4 @@
+# TODO try upgrading everything
 [tool.poetry]
 name = "sheepdog"
 version = "5.1.0"
@@ -37,7 +38,7 @@ sqlalchemy = "1.3.*"
 #Werkzeug = "0.16.0"
 #xmltodict = "0.9.2"
 #more-itertools = "5.0.0"
-#cdispyutils = ">=1.0.4"
+cdispyutils = ">=2.0.1"
 psqlgraph = "3.0.1"
 cdiserrors = ">=1.0.0"
 cdislogging = "1.0.0"
@@ -64,6 +65,7 @@ coverage = "5.3.0"
 #cdis_oauth2client = "1.0.0" # TODO merge feat/3.9 PR and pin
 cdis_oauth2client = {git = "https://github.com/uc-cdis/cdis_oauth2client", rev = "feat/3.9"}
 #cryptography = "2.8"  # TODO dev dep?
+cryptography = "*"
 mock = "1.0.1"
 pytest-flask = ">=1.2.0"
 moto = "0.4.5"

tests/integration/api.py

@@ -67,9 +67,12 @@ def app_init(app):
     except KeyError:
         app.logger.error("Secret key not set in config! Authentication will not work")
 
+    v0 = "/v0"
     try:
         sheepdog_blueprint = sheepdog.create_blueprint("submission")
-        app.register_blueprint(sheepdog_blueprint, url_prefix="/v0/submission")
+        app.register_blueprint(sheepdog_blueprint, url_prefix=v0 + "/submission")
+        sheepdog_blueprint.name += "_legacy"
+        app.register_blueprint(sheepdog_blueprint, url_prefix="/submission")
     except (ValueError, AssertionError):
         app.logger.info("Blueprint is already registered!!!")