Try to fix https://github.com/tosdr/edit.tosdr.org/issues/1156

.cookiecutter/includes/.github/workflows/environments.json

@@ -1,36 +1,36 @@
 {
-  "qa": {
-    "github_environment_name": "QA",
-    "github_environment_url": "https://qa.hypothes.is/search",
+  "staging": {
+    "github_environment_name": "Staging",
+    "github_environment_url": "https://staging.hypothes.is/search",
     "aws_region": "us-west-1",
     "elasticbeanstalk_application": "h",
-    "elasticbeanstalk_environment": "qa"
+    "elasticbeanstalk_environment": "staging"
   },
-  "qa_websocket": {
-    "github_environment_name": "QA (WebSocket)",
-    "github_environment_url": "https://qa.hypothes.is/docs/help",
+  "staging_websocket": {
+    "github_environment_name": "Staging (WebSocket)",
+    "github_environment_url": "https://staging.hypothes.is/docs/help",
     "aws_region": "us-west-1",
     "elasticbeanstalk_application": "h-websocket",
-    "elasticbeanstalk_environment": "qa"
+    "elasticbeanstalk_environment": "staging"
   },
   "production": {
-    "needs": ["qa", "qa_websocket"],
+    "needs": ["staging", "staging_websocket"],
     "github_environment_name": "Production",
     "github_environment_url": "https://hypothes.is/search",
     "aws_region": "us-west-1",
     "elasticbeanstalk_application": "h",
     "elasticbeanstalk_environment": "prod"
   },
   "production_websocket": {
-    "needs": ["qa", "qa_websocket"],
+    "needs": ["staging", "staging_websocket"],
     "github_environment_name": "Production (WebSocket)",
     "github_environment_url": "https://hypothes.is/docs/help",
     "aws_region": "us-west-1",
     "elasticbeanstalk_application": "h-websocket",
     "elasticbeanstalk_environment": "prod"
   },
   "production_canada": {
-    "needs": ["qa", "qa_websocket"],
+    "needs": ["staging", "staging_websocket"],
     "github_environment_name": "Production (Canada)",
     "github_environment_url": "https://ca.hypothes.is/search",
     "aws_region": "ca-central-1",

.coveragerc

@@ -3,14 +3,17 @@ branch = True
 parallel = True
 source =
     h
-    tests/h
+    tests/unit
 omit =
     h/debug.py
     h/migrations/*
     h/cli/*
+    h/__main__.py
+    h/pshell.py
 
 [report]
 show_missing = True
 precision = 2
-fail_under = 98.26
+fail_under = 100
+
 skip_covered = True

.eslintrc

@@ -6,9 +6,9 @@
   },
   "overrides": [
     {
-      "files": ["*.mjs"],
+      "files": ["*.js"],
+      "excludedFiles": ["h/**"],
       "env": { "node": true },
-      "parserOptions": { "sourceType": "module" }
     }
   ]
 }

.github/dependabot.yml

@@ -1,17 +1,15 @@
 version: 2
 updates:
-
 - package-ecosystem: pip
   directory: "/"
   schedule:
-    interval: daily
-    time: "10:00"
+    interval: weekly
   open-pull-requests-limit: 10
 
 - package-ecosystem: docker
   directory: "/"
   schedule:
-    interval: daily
+    interval: monthly
   open-pull-requests-limit: 10
   ignore:
     # Only send PRs for patch versions of Python.
@@ -22,5 +20,4 @@ updates:
   directory: "/"
   schedule:
     interval: monthly
-    time: "10:00"
   open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -1,148 +1,170 @@
-name: Continuous integration
-
+name: CI
 on:
-  workflow_dispatch:
-  pull_request:
+  push:
     paths-ignore:
       - '.cookiecutter/*'
-      - '.gitignore'
-      - 'HACKING.md'
+      - '.github/dependabot.yml'
+      - '.github/workflows/deploy.yml'
+      - '.github/workflows/redeploy.yml'
+      - 'bin/logger'
+      - 'conf/development.ini'
+      - 'production.ini'
+      - 'conf/supervisord*.conf'
+      - 'docs/*'
+      - 'requirements/*.in'
+      - 'requirements/dev.txt'
+      - '**/.gitignore'
+      - 'Dockerfile'
       - 'LICENSE'
+      - '*.md'
+      - 'docker-compose.yml'
+  workflow_dispatch:
   workflow_call:
-
-env:
-  TOX_PARALLEL_NO_SPINNER: 1
-  PYTEST_ADDOPTS: --exitfirst
-
+  schedule:
+  - cron: '0 1 * * *'
 jobs:
-  backend:
-    name: Backend
+  Format:
     runs-on: ubuntu-latest
-
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Cache the .tox dir
+        uses: actions/cache@v3
+        with:
+          path: .tox
+          key: format-${{ runner.os }}-tox-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            format-${{ runner.os }}-tox-
+      - run: python -m pip install 'tox<4'
+      - run: tox -e checkformatting
+  Lint:
+    runs-on: ubuntu-latest-32-cores
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Cache the .tox dir
+        uses: actions/cache@v3
+        with:
+          path: .tox
+          key: lint-${{ runner.os }}-tox-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            lint-${{ runner.os }}-tox-
+      - run: python -m pip install 'tox<4'
+      - run: tox -e lint
+  Tests:
+    runs-on: ubuntu-latest-32-cores
     services:
       postgres:
-        image: postgres:11.5-alpine
+        image: postgres:15.6-alpine
         ports:
         - 5432:5432
-
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       elasticsearch:
         image: hypothesis/elasticsearch:latest
         ports:
         - 9200:9200
         env:
           discovery.type: single-node
-
     steps:
-    - name: Checkout git repo
-      uses: actions/checkout@v3
-
-    - name: Setup python
-      uses: actions/setup-python@v4
-      with:
-        python-version-file: '.python-version'
-
-    - name: Update pip
-      run: python -m pip install --upgrade pip
-
-    - name: Install tox
-      run: python -m pip install 'tox<4'
-
-    - name: Create test databases
-      run: psql -U postgres -h localhost -p 5432 -c 'CREATE DATABASE htest'
-
-    - name: Cache the .tox dir
-      uses: actions/cache@v3
-      with:
-        path: |
-          .tox/lint
-          .tox/checkformatting
-          .tox/tests
-          .tox/coverage
-        key: ${{ runner.os }}-tox-backend-${{ hashFiles('tox.ini', 'requirements/**', 'setup.py', 'setup.cfg') }}
-    - name: Run tox
-      run: tox --parallel auto -e checkformatting,tests,coverage,lint
-
-  functests:
-    name: Functional tests
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Cache the .tox dir
+        uses: actions/cache@v3
+        with:
+          path: .tox
+          key: tests-${{ runner.os }}-tox-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            tests-${{ runner.os }}-tox-
+      - name: Create test database
+        run: psql -U postgres -h localhost -p 5432 -c 'CREATE DATABASE h_tests'
+      - run: python -m pip install 'tox<4'
+      - run: tox -e tests
+        env:
+          COVERAGE_FILE: .coverage.${{ matrix.python-version }}
+      - name: Upload coverage file
+        uses: actions/upload-artifact@v3
+        with:
+          name: coverage
+          path: .coverage.*
+  Coverage:
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Cache the .tox dir
+        uses: actions/cache@v3
+        with:
+          path: .tox
+          key: coverage-${{ runner.os }}-tox-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            coverage-${{ runner.os }}-tox-
+      - name: Download coverage files
+        uses: actions/download-artifact@v3
+        with:
+          name: coverage
+      - run: python -m pip install 'tox<4'
+      - run: tox -e coverage
+  Functests:
     runs-on: ubuntu-latest
-
     services:
       postgres:
-        image: postgres:11.5-alpine
+        image: postgres:15.6-alpine
         ports:
         - 5432:5432
+        env:
+          POSTGRES_HOST_AUTH_METHOD: trust
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       elasticsearch:
         image: hypothesis/elasticsearch:latest
         ports:
         - 9200:9200
         env:
           discovery.type: single-node
       rabbitmq:
-        image: rabbitmq:3.6-management-alpine
+        image: rabbitmq:3.12-management-alpine
         ports:
         - 5672:5672
-
-    steps:
-    - name: Checkout git repo
-      uses: actions/checkout@v3
-
-    - name: Setup python
-      uses: actions/setup-python@v4
-      with:
-        python-version-file: '.python-version'
-
-    - name: Update pip
-      run: python -m pip install --upgrade pip
-
-    - name: Install tox
-      run: python -m pip install 'tox<4'
-
-    - name: Create test databases
-      run: psql -U postgres -h localhost -p 5432 -c 'CREATE DATABASE htest'
-
-    - name: Cache the .tox dir
-      uses: actions/cache@v3
-      with:
-        path: |
-          .tox/functests
-        key: ${{ runner.os }}-tox-functests-${{ hashFiles('tox.ini', 'requirements/**', 'setup.py', 'setup.cfg') }}
-
-    - name: Cache the node_modules dir
-      uses: actions/cache@v3
-      with:
-        path: node_modules
-        key: ${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}
-
-    - name: npm install
-      run: npm install
-
-    - name: gulp build
-      run: gulp build
-
-    - name: Run tox
-      # Note we run the func tests backwards here to prove there are no order
-      # dependent tests
-      run: tox -e functests -- tests/functional --reverse
-
-  frontend:
-    name: Frontend
-    runs-on: ubuntu-latest
-
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Cache the node_modules dir
-      uses: actions/cache@v3
-      with:
-        path: node_modules
-        key: ${{ runner.os }}-node_modules-${{ hashFiles('package-lock.json') }}
-
-    - name: Format
-      run: make frontend-checkformatting
-
-    - name: Lint
-      run: make frontend-lint
-
-    - name: Test
-      run: gulp test
+      - uses: actions/checkout@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+      - name: Cache the .tox dir
+        uses: actions/cache@v3
+        with:
+          path: .tox
+          key: functests-${{ runner.os }}-tox-${{ hashFiles('tox.ini') }}-${{ hashFiles('requirements/*') }}
+          restore-keys: |
+            functests-${{ runner.os }}-tox-
+      - name: Create test database
+        run: psql -U postgres -h localhost -p 5432 -c 'CREATE DATABASE h_functests'
+      - run: python -m pip install 'tox<4'
+      - run: yarn install --immutable
+      - run: yarn build
+      - run: tox -e functests
+  Frontend:
+    uses: ./.github/workflows/frontend.yml