Merge branch 'master' into feat/gunicorn

EliseCastle23 · web-flow · commit 2bfcb7f7c97d · 2024-10-22T16:06:42.000-06:00
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
@@ -21,5 +21,7 @@ jobs:
       CI_TEST_ORCID_PASSWORD: ${{ secrets.CI_TEST_ORCID_PASSWORD }}
       CI_TEST_RAS_USERID: ${{ secrets.CI_TEST_RAS_USERID }}
       CI_TEST_RAS_PASSWORD: ${{ secrets.CI_TEST_RAS_PASSWORD }}
+      CI_TEST_RAS_2_USERID: ${{ secrets.CI_TEST_RAS_2_USERID }}
+      CI_TEST_RAS_2_PASSWORD: ${{ secrets.CI_TEST_RAS_2_PASSWORD }}
       CI_SLACK_BOT_TOKEN: ${{ secrets.CI_SLACK_BOT_TOKEN }}
       CI_SLACK_CHANNEL_ID: ${{ secrets.CI_SLACK_CHANNEL_ID }}
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,7 @@ gen3dictionary = ">=2.0.3"
 simplejson = ">=3.8"
 stopit = ">=1.1"
 Flask = ">=2.2.5"
-Flask-Cors = ">=3.0.9"
+Flask-Cors = "<6"
 gen3authz = "<3"
 PyYAML = ">=5.4.1"
 dicttoxml = ">=1.5"
