Skip to content
Snippets Groups Projects
Commit 94b8fd3a authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'allow-core-30' into 'master'

Allow core 3.0

See merge request !79
parents 8021acd1 0d6febc3
No related branches found
No related tags found
1 merge request!79Allow core 3.0
Pipeline #112036 failed
...@@ -41,7 +41,7 @@ python = "^3.9" ...@@ -41,7 +41,7 @@ python = "^3.9"
feedparser = "^6.0.0" feedparser = "^6.0.0"
django-feed-reader = "^1.0.0" django-feed-reader = "^1.0.0"
ics = "^0.7" ics = "^0.7"
aleksis-core = "^2.0" aleksis-core = "^3.0.dev3"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
aleksis-builddeps = "*" aleksis-builddeps = "*"
......
...@@ -10,7 +10,7 @@ skip_install = true ...@@ -10,7 +10,7 @@ skip_install = true
envdir = {toxworkdir}/globalenv envdir = {toxworkdir}/globalenv
commands_pre = commands_pre =
poetry install poetry install
poetry run aleksis-admin yarn install poetry run aleksis-admin vite build
poetry run aleksis-admin collectstatic --no-input poetry run aleksis-admin collectstatic --no-input
commands = commands =
poetry run pytest --cov=. {posargs} aleksis/ poetry run pytest --cov=. {posargs} aleksis/
...@@ -27,6 +27,8 @@ commands = ...@@ -27,6 +27,8 @@ commands =
poetry run black --check --diff aleksis/ poetry run black --check --diff aleksis/
poetry run isort -c --diff --stdout aleksis/ poetry run isort -c --diff --stdout aleksis/
poetry run flake8 {posargs} 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] [testenv:security]
commands = commands =
...@@ -46,6 +48,7 @@ commands = poetry run make -C docs/ html {posargs} ...@@ -46,6 +48,7 @@ commands = poetry run make -C docs/ html {posargs}
commands = commands =
poetry run isort aleksis/ poetry run isort aleksis/
poetry run black aleksis/ poetry run black aleksis/
node cache/node_modules/.bin/prettier --write .
[testenv:makemessages] [testenv:makemessages]
commands = commands =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment