Fix old Poetry config, use new dev container, run formatting

Author: ahosgood

.devcontainer/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   web:
     volumes:

.env.example

@@ -13,3 +13,4 @@ OHOS_ROSETTA_CLIENT_BASE_URL=
 FEATURE_GEO_LAT=
 FEATURE_GEO_LON=
 FEATURE_GEO_ZOOM=
+PLATFORMSH_CLI_TOKEN=

.eslintrc.js

@@ -22,5 +22,9 @@ module.exports = {
         sourceType: "module",
     },
     rules: {},
-    ignorePatterns: ["templates/static/scripts/**/*.js", ".*.js", "*.config.js"],
+    ignorePatterns: [
+        "templates/static/scripts/**/*.js",
+        ".*.js",
+        "*.config.js",
+    ],
 };

.github/workflows/_tests.yml

@@ -76,7 +76,7 @@ jobs:
         run: poetry run coverage run manage.py test etna
       - name: Check for missing migrations
         run: poetry run python manage.py makemigrations --check --noinput
-  
+
   prettier:
     name: Prettier format
     runs-on: ubuntu-latest

.github/workflows/check-migrations.yml

@@ -3,7 +3,7 @@ name: Check Migrations
 on:
   pull_request:
     paths:
-      - 'etna/*/migrations/**'
+      - "etna/*/migrations/**"
 
 jobs:
   check-migrations:
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Check migrations
-        run: python .github/scripts/check_migrations.py
+        run: python .github/scripts/check_migrations.py

.github/workflows/create-release-tag.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Create pull request
         run: gh pr create -B ${{ steps.extract_branch.outputs.BRANCH }} -H "release/v${{ steps.version-tag.outputs.CALVER }}" --title "Version ${{ steps.version-tag.outputs.CALVER }}" --body "Created by Github action https://github.com/nationalarchives/ds-wagtail/actions/runs/${{ github.run_id }}" --no-maintainer-edit
         env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       # - name: Merge the pull request
       #   run: gh pr merge "release/v${{ steps.version-tag.outputs.CALVER }}" --admin --merge
       #   env:

.github/workflows/platformsh-cd-ohos.yml

@@ -7,22 +7,22 @@ on:
       - ohos
     paths:
       # Host config
-      - '.plaform/**'
-      - '.platform.app.yaml'
-      - 'gunicorn.conf.py'
+      - ".plaform/**"
+      - ".platform.app.yaml"
+      - "gunicorn.conf.py"
       # Python config
-      - 'poetry.lock'
-      - 'pyproject.toml'
+      - "poetry.lock"
+      - "pyproject.toml"
       # NPM config
-      - 'package.json'
-      - 'package-lock.json'
-      - 'webpack.config.js'
+      - "package.json"
+      - "package-lock.json"
+      - "webpack.config.js"
       # App changes
-      - 'config/**'
-      - 'sass/**'
-      - 'scripts/**'
-      - 'templates/**'
-      - 'etna/**'
+      - "config/**"
+      - "sass/**"
+      - "scripts/**"
+      - "templates/**"
+      - "etna/**"
 
 jobs:
   ci:

.github/workflows/remove-untagged.yml

@@ -26,4 +26,4 @@ jobs:
                     // const deleteResponse = await github.request("DELETE /orgs/${{ github.repository_owner }}/packages/container/${{ vars.DOCKER_IMAGE_NAME }}/versions/" + version.id, { });
                     // console.log("status " + deleteResponse.status)
                 }
-            }
+            }

.platform.app.yaml

@@ -7,15 +7,15 @@ name: app
 # in multiple versions. Check the Python documentation
 # (https://docs.platform.sh/languages/python.html#supported-versions)
 # to find the supported versions for the 'python' type.
-type: 'python:3.12'
+type: "python:3.12"
 
 dependencies:
   python3:
-    poetry: '1.8.1'
+    poetry: "1.8.1"
 
 variables:
   env:
-    DJANGO_SETTINGS_MODULE: 'config.settings.platform'
+    DJANGO_SETTINGS_MODULE: "config.settings.platform"
     # pip
     POETRY_VIRTUALENVS_IN_PROJECT: true
     POETRY_VIRTUALENVS_CREATE: true
@@ -30,14 +30,14 @@ disk: 4096
 # to the application in the PLATFORM_RELATIONSHIPS variable. The right-hand
 # side is in the form <service name>:<endpoint name>.
 relationships:
-    db: 'db:postgresql'
-    redis: "redis:redis"
+  db: "db:postgresql"
+  redis: "redis:redis"
 
 hooks:
   build: |
     # Add platform CLI
     curl -sS https://platform.sh/cli/installer | php
-    
+
     # Download the latest version of pip
     python3.12 -m pip install --upgrade pip
 
@@ -49,7 +49,7 @@ hooks:
     export NVM_DIR="$PLATFORM_APP_DIR/.nvm"
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-    
+
     nvm install
     npm install
     mkdir -p templates/static/assets
@@ -72,11 +72,11 @@ web:
       allow: false
       rules:
         '^/favicon\.ico$':
-            allow: false
+          allow: false
     "/static":
       # Allow liberal controls to allow CORS for admin font assets
       headers:
-        Access-Control-Allow-Origin: '*'
+        Access-Control-Allow-Origin: "*"
       root: static
       expires: 1y
       allow: true
@@ -111,7 +111,7 @@ crons:
   # Take snapshot at 5am every morning
   # https://docs.platform.sh/administration/snapshot-and-restore.html#automated-snapshots
   snapshot:
-    spec: '0 5 * * *'
+    spec: "0 5 * * *"
     cmd: |
       if [ "$PLATFORM_BRANCH" = main ]; then
         platform backup:create --yes --no-wait
@@ -120,8 +120,8 @@ crons:
   # Renew cert by forcing a redeploy at 4 am (UTC) on the 1st and 15th of every month.
   # https://docs.platform.sh/configuration/routes/https.html#automatic-ssl-certificate-renewal
   renewcert:
-    spec: '0 4 1,15 * *'
+    spec: "0 4 1,15 * *"
     cmd: |
       if [ "$PLATFORM_BRANCH" = main ]; then
         platform redeploy --yes --no-wait
-      fi
+      fi

.platform/routes.yaml

@@ -1,24 +1,24 @@
 # Each route describes how an incoming URL is going to be processed by Platform.sh.
 
 "https://{default}/":
-    type: upstream
-    upstream: "app:http"
-    cache:
-        enabled: false
-        default_ttl: 300
-        cookies:
-            - sessionid
-            - csrftoken
-            - messages
-            - csrftoken
-            - cookies_policy
-            - dontShowCookieNotice
-            - beta_banner_dismissed
-        headers:
-            - Accept
-            - Vary
+  type: upstream
+  upstream: "app:http"
+  cache:
+    enabled: false
+    default_ttl: 300
+    cookies:
+      - sessionid
+      - csrftoken
+      - messages
+      - csrftoken
+      - cookies_policy
+      - dontShowCookieNotice
+      - beta_banner_dismissed
+    headers:
+      - Accept
+      - Vary
 
 # Redirect www routes to preseve links to old plaform.sh domain
 "https://www.{default}/":
-    type: redirect
-    to: "https://{default}/"
+  type: redirect
+  to: "https://{default}/"