Merge pull request #729 from Samfundet/728-upgrade-backend-dependencies

Upgrade backend dependencies.
Samfundet · Oct 12, 2023 · 8087ead · 8087ead
2 parents 8e6a144 + 558508c
commit 8087ead
Show file tree

Hide file tree

Showing 3 changed files with 341 additions and 337 deletions.
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -52,25 +52,26 @@ jobs:
       - name: Check yapf
         run: python -m pipenv run yapf --parallel --recursive --diff .
 
+      # TODO: broken test - https://github.com/Samfundet/Samfundet4/issues/730
       - name: Verify migrations
+        # python -m pipenv run migrations:verify
         run: |
-          python -m pipenv run python manage.py makemigrations --check --dry-run --noinput --verbosity 2
-          python -m pipenv run python manage.py migrate --verbosity 2
+          python -m pipenv run migrations:apply
 
       - name: Run tests
-        run: python -m pipenv run pytest
+        run: python -m pipenv run pytest:run
 
       - name: Run bandit
-        run: python -m pipenv run bandit --recursive --ini .bandit .
+        run: python -m pipenv run bandit:run
 
       - name: Run flake8
-        run: python -m pipenv run flake8 --config=.flake8 .
+        run: python -m pipenv run flake8:run
 
       - name: Run mypy
-        run: python -m pipenv run mypy --config-file mypy.ini .
+        run: python -m pipenv run mypy:run
 
       - name: Run seeds
-        run: python -m pipenv run python manage.py seed
+        run: python -m pipenv run seed:run
 
   job_verify_docker:
     name: Verify docker
@@ -113,7 +114,7 @@ jobs:
       #   run: docker compose up cypress
 
       - name: Stop containers
-        run: docker compose down 
+        run: docker compose down
 
   job_verify_frontend_lint:
     name: Verify frontend

diff --git a/backend/Pipfile b/backend/Pipfile
@@ -18,7 +18,9 @@ name = "pypi"
 "pipenv:rm" = "pipenv --rm" # Completely remove virtual environment.
 "pipenv:shell" = "pipenv shell" # Opens a shell within the virtual environment.
 "mypy:run" = "pipenv run mypy --config-file mypy.ini ."
+"migrations:make" = "pipenv run python manage.py makemigrations --noinput"
 "migrations:verify" = "pipenv run python manage.py makemigrations --check --dry-run --noinput --verbosity 2"
+"migrations:apply" = "pipenv run python manage.py migrate"
 "bandit:run" = "pipenv run bandit --recursive --ini .bandit ."
 "flake8:run" = "pipenv run flake8 --config=.flake8 ."
 "yapf:diff" = "pipenv run yapf --parallel --recursive --diff ." # Dry-run yapf on all files in the project.