From c1106513f0ad824bb21d752d68249d50fa802bf0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 15:49:23 +0000
Subject: [PATCH 1/2] build(deps-dev): bump setuptools from 62.1.0 to 65.5.1
 (#1552)

* build(deps-dev): bump setuptools from 62.1.0 to 65.5.1

Bumps [setuptools](https://github.com/pypa/setuptools) from 62.1.0 to 65.5.1.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v62.1.0...v65.5.1)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Merge branch 'master' into dependabot/pip/setuptools-65.5.1
---
 Pipfile.lock | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 04f7f27f6..5c1fac367 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1595,11 +1595,12 @@
         },
         "setuptools": {
             "hashes": [
-                "sha256:26ead7d1f93efc0f8c804d9fafafbe4a44b179580a7105754b245155f9af05a8",
-                "sha256:47c7b0c0f8fc10eec4cf1e71c6fdadf8decaa74ffa087e68cd1c20db7ad6a592"
+                "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31",
+                "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"
             ],
+            "index": "pypi",
             "markers": "python_version >= '3.7'",
-            "version": "==62.1.0"
+            "version": "==65.5.1"
         },
         "six": {
             "hashes": [

From a9553a4a13ce7af7f487789275b5075c7b6b1af2 Mon Sep 17 00:00:00 2001
From: Florian Aucomte <33633200+faucomte97@users.noreply.github.com>
Date: Tue, 12 Dec 2023 16:27:05 +0000
Subject: [PATCH 2/2] ci: Remove Crowdin action again (#1557)

---
 .github/workflows/publish-python-package.yml | 45 ++++++++++----------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/publish-python-package.yml b/.github/workflows/publish-python-package.yml
index 8e7bd94d9..90db23f70 100644
--- a/.github/workflows/publish-python-package.yml
+++ b/.github/workflows/publish-python-package.yml
@@ -27,28 +27,29 @@ jobs:
           pipenv install --dev --system
           pip install -U git+https://github.com/ocadotechnology/codeforlife-portal.git#egg=codeforlife-portal #TODO: Remove as part of #688
           sudo apt-get install gettext
-      - name: Prepare files for Crowdin
-        run: |
-          mkdir -p game/locale
-          cd game && django-admin makemessages -l en_GB --no-wrap && cd -
-          cd game && django-admin makemessages -l en_GB --no-wrap -d djangojs --ignore "static/game/js/foundation/*" && cd - # some files from foundation use '_' for their own purpose
-      - name: Run Crowdin (Upload sources and download translations)
-        uses: crowdin/github-action@v1
-        with:
-          upload_sources: true
-          download_translations: true
-          push_translations: false
-          project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
-          token: ${{ secrets.CROWDIN_API_KEY }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.CFL_BOT_GITHUB_TOKEN }}
-      - name: Fix translation files owner
-        run: sudo chown -R $USER game/locale
-      - name: Compile messages
-        run: |
-          pushd game
-          django-admin compilemessages
-          popd
+      # TODO: Restore action once we figure out how to use bot token properly (if still needed)
+#      - name: Prepare files for Crowdin
+#        run: |
+#          mkdir -p game/locale
+#          cd game && django-admin makemessages -l en_GB --no-wrap && cd -
+#          cd game && django-admin makemessages -l en_GB --no-wrap -d djangojs --ignore "static/game/js/foundation/*" && cd - # some files from foundation use '_' for their own purpose
+#      - name: Run Crowdin (Upload sources and download translations)
+#        uses: crowdin/github-action@v1
+#        with:
+#          upload_sources: true
+#          download_translations: true
+#          push_translations: false
+#          project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
+#          token: ${{ secrets.CROWDIN_API_KEY }}
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.CFL_BOT_GITHUB_TOKEN }}
+#      - name: Fix translation files owner
+#        run: sudo chown -R $USER game/locale
+#      - name: Compile messages
+#        run: |
+#          pushd game
+#          django-admin compilemessages
+#          popd
       - name: Release rapid-router
         uses: relekang/python-semantic-release@v7.34.6
         with: