From 0d6febc387ac5da2ac76e60c6287fd1c70901170 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Fri, 3 Feb 2023 15:55:54 +0100
Subject: [PATCH] Bump requirement for aleksis-core to 3.0dev3 and adapt tox
config
---
pyproject.toml | 2 +-
tox.ini | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 828ce80..24d4cfc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,7 +41,7 @@ python = "^3.9"
feedparser = "^6.0.0"
django-feed-reader = "^1.0.0"
ics = "^0.7"
-AlekSIS-Core = "^3.0.dev0"
+aleksis-core = "^3.0.dev3"
[tool.poetry.dev-dependencies]
aleksis-builddeps = "*"
diff --git a/tox.ini b/tox.ini
index 78e0956..1098d9d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ skip_install = true
envdir = {toxworkdir}/globalenv
commands_pre =
poetry install
- poetry run aleksis-admin webpack_bundle
+ poetry run aleksis-admin vite build
poetry run aleksis-admin collectstatic --no-input
commands =
poetry run pytest --cov=. {posargs} aleksis/
@@ -27,6 +27,8 @@ commands =
poetry run black --check --diff aleksis/
poetry run isort -c --diff --stdout aleksis/
poetry run flake8 {posargs} aleksis/
+ node cache/node_modules/.bin/prettier --check .
+ node cache/node_modules/.bin/eslint aleksis/**/*/frontend/**/*.{js,vue}
[testenv:security]
commands =
@@ -46,6 +48,7 @@ commands = poetry run make -C docs/ html {posargs}
commands =
poetry run isort aleksis/
poetry run black aleksis/
+ node cache/node_modules/.bin/prettier --write .
[testenv:makemessages]
commands =
--
GitLab