MRG: Merge remote-tracking branch 'origin/main' into use-octue-withou…

…t-answer-topics
octue · Nov 29, 2023 · e9cb4c7 · e9cb4c7
2 parents a3decdb + e797254
commit e9cb4c7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 37 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -37,7 +37,7 @@ jobs:
     needs: [publish]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install poetry
         run: pip install poetry

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,10 +46,10 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
 
@@ -77,4 +77,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           files: coverage.xml
-          fail_ci_if_error: true
+          fail_ci_if_error: false
+          # Token is not required for public repos, but see:
+          # https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,7 @@ django = ">=3.0,<4.0"
 channels = ">=3.0,<4.0"
 octue = {git = "https://github.com/octue/octue-sdk-python.git", rev = "publish-answers-to-question-topic-2"}
 pika = "^1.2.0"
-django-gcp = ">=0.7.3,<0.11"
+django-gcp = ">=0.7.3,<0.12"
 django-jsoneditor = "^0.2.2"
 django-model-utils = "^4.2.0"