[DONE] Develop 3.7.0

Merge pull request #1119 from EsupPortail/develop

Author: ptitloup

.coveragerc

@@ -1,14 +1,24 @@
 
 [report]
-# Here you can exclude a file from coverage testing
+# Add a column to the report with a summary of which lines (and branches) the tests missed.
+# This makes it easy to go from a failure to fixing it, rather than using the HTML report.
+show_missing = True
+
+[run]
+relative_files = True
+source = .
 
+# This ensures that your code runs through both the True and False paths of each conditional statement.
+# branch = True
+
+# Here you can exclude a file from coverage testing
 # nb: you can also add a "# pragma: no cover"
 # on each function you don't want to be covered
-[run]
-source = pod/
 omit = pod/*settings*.py
+       pod/custom/settings*.py
        pod/*apps.py
        pod/wsgi.py
+       pod/db_migrations/*
        */tests/*
        */commands/*
        */migrations/*

.eslintrc.js

@@ -1,9 +1,9 @@
 module.exports = {
   "env": {
     "browser": true,
-    "commonjs": true,
+    "commonjs": false,
     "es2021": true,
-    "node": true
+    "node": false
   },
   "extends": "eslint:recommended",
   "parserOptions": {
@@ -30,6 +30,8 @@ module.exports = {
   },
   /* functions and Objects that will not trigger a "not defined" error. */
   "globals": {
+    "require": true,
+    "process": true,
     "Cookies": "readonly",
     "gettext": "readonly",
     "ngettext": "readonly",
@@ -41,5 +43,12 @@ module.exports = {
     "showalert": "writable",
     "showLoader": "writable",
     "manageDisableBtn": "writable"
-  }
+  },
+  overrides: [
+    {
+      // Allow use of import & export functions
+      files: [ "pod/main/static/js/utils.js", "pod/video/static/js/regroup_videos_by_theme.js" ],
+      parserOptions: { sourceType: "module" },
+    }
+  ]
 };

.gitattributes

@@ -12,4 +12,5 @@
 
 # Désigne tous les fichiers qui sont vraiment binaires et ne doivent pas être modifiés.
 *.png binary
-*.jpg binary
+*.jpg binary
+*.webp binary

.github/pull_request_template.md

@@ -1,4 +1,4 @@
-Before sending your pull request, make sure the following are done:
+# Before sending your pull request, make sure the following are done
 
 * [ ] You have read our [contribution guidelines](https://github.com/EsupPortail/Esup-Pod/blob/master/CONTRIBUTING.md).
 * [ ] Your PR targets the `develop` branch.

.github/workflows/code_formatting.yml

@@ -4,6 +4,7 @@ name: Code Formatting
 on:
   push:
     branches: [master, develop]
+  workflow_dispatch:
 
 jobs:
   code-formatting:

.github/workflows/pod_dev.yml

@@ -11,15 +11,16 @@ on:
   pull_request:
     branches:
     - develop
+  workflow_dispatch:
 
 env:
   PYTHON_VERSION: '3.9'
   DJANGO_SUPERUSER_USERNAME: "admin"
   DJANGO_SUPERUSER_PASSWORD: "passwd"
-  DJANGO_SUPERUSER_EMAIL: "noreplay@uni.fr"
+  DJANGO_SUPERUSER_EMAIL: "noreply@uni.fr"
   ELASTICSEARCH_TAG: "elasticsearch:7.17.18"
-  NODE_VERSION: "19"
-  NODE_TAG: "node:19"
+  NODE_VERSION: "20"
+  NODE_TAG: "node:20"
   PYTHON_TAG: "python:3.9-bullseye"
   REDIS_TAG: "redis:alpine3.16"
   DOCKER_ENV: "full-test"
@@ -55,18 +56,17 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          sudo apt-get clean
           sudo apt-get update
-          sudo apt-get install ffmpeg
-          sudo apt-get install -y ffmpegthumbnailer
+          sudo apt-get install -y --no-install-recommends ffmpeg ffmpegthumbnailer
+          sudo apt-get clean
+          sudo rm -rf /var/lib/apt/lists/*
           python -m pip install --upgrade pip
           pip install -r requirements-dev.txt
           sudo npm install -g yarn
 
-      # FLAKE 8
+      # FLAKE 8 (see setup.cfg for configurations)
       - name: Flake8 compliance
-        run: |
-          flake8 --max-complexity=7 --ignore=E501,W503,E203 --exclude .git,pod/*/migrations/*.py,test_settings.py,node_modules/*/*.py,pod/static/*.py,pod/custom/tenants/*/*.py
+        run: flake8
 
       ## Start remote encoding and transcoding test ##
       - name: Create settings local file
@@ -106,7 +106,7 @@ jobs:
           docker exec pod-back-with-volumes ps auxf
           docker exec pod-back-with-volumes python manage.py loaddata pod/video/fixtures/sample_videos.json
       - name: run test in docker
-        run: docker exec pod-back-with-volumes coverage run --append --source='.' manage.py test -v 3 --keepdb pod.video_encode_transcript.tests.test_remote_encode_transcode
+        run: docker exec pod-back-with-volumes coverage run --append manage.py test -v 3 --keepdb pod.video_encode_transcript.tests.test_remote_encode_transcode
 
       - name: Run pa11y-ci full
         run: docker exec pa11y-ci pa11y-ci -c /usr/src/app/dockerfile-dev-with-volumes/pa11y-ci/config.json
@@ -135,15 +135,22 @@ jobs:
 
       - name: Setup Pod
         run: |
-          coverage run --append --source='.' manage.py create_pod_index --settings=pod.main.test_settings
+          coverage run --append manage.py create_pod_index --settings=pod.main.test_settings
           python manage.py makemigrations --settings=pod.main.test_settings
           python manage.py migrate --settings=pod.main.test_settings
 
       - name: Run Tests with coverage
         env:
           PYTHONUNBUFFERED: 1
         run: |
-          coverage run --append --source='.' manage.py test -v 3 --settings=pod.main.test_settings
+          coverage run --append manage.py test -v 3 --settings=pod.main.test_settings
+          coverage xml -o cobertura.xml
+
+      - name: Codacy coverage reporter
+        run: bash <(curl -Ls https://coverage.codacy.com/get.sh)
+        continue-on-error: true
+        env:
+          CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
 
       - name: Send coverage to coveralls.io
         # coveralls command has been installed by requirements-dev.txt

.github/workflows/pod_main.yml

@@ -10,6 +10,7 @@ on:
       branches:
       - main
       - master
+    workflow_dispatch:
 
 jobs:
     Pod-Main:
@@ -35,7 +36,7 @@ jobs:
               uses: actions/setup-python@v5
               with:
                 python-version: ${{ matrix.python-version }}
-            
+
             # Remove apt repos that are known to break from time to time
             # See https://github.com/actions/virtual-environments/issues/323
             - name: Remove broken apt repos [Ubuntu]
@@ -44,11 +45,10 @@ jobs:
 
             - name: Install Dependencies
               run: |
-                sudo apt-get clean
                 sudo apt-get update
-                sudo apt-get install ffmpeg
-                sudo apt-get install -y ffmpegthumbnailer
-                sudo apt-get install -y npm
+                sudo apt-get install -y --no-install-recommends ffmpeg ffmpegthumbnailer npm
+                sudo apt-get clean
+                sudo rm -rf /var/lib/apt/lists/*
                 python -m pip install --upgrade pip
                 pip install -r requirements-dev.txt
                 sudo npm install -g yarn

.gitignore

@@ -1,4 +1,4 @@
-#                       Compiled source #
+# Compiled source #
 ###################
 *.com
 *.class
@@ -60,6 +60,7 @@ chromedriver
 pod/static/
 *.bak
 .coverage
+.cache_ggshield
 htmlcov
 compile-model
 

.markdownlint.json

@@ -0,0 +1,7 @@
+{
+  "default": true,
+  "MD033": false,
+  "MD013": {
+    "line_length": 90
+  }
+}

.pre-commit-config.yaml

@@ -0,0 +1,7 @@
+repos:
+  - repo: https://github.com/gitguardian/ggshield
+    rev: v1.27.0
+    hooks:
+      - id: ggshield
+        language_version: python3
+        stages: [commit]