Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
ddf52a36
Verified
Commit
ddf52a36
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch '60-make-alsijil-work-with-current-core-fixes' into fix/design
parents
f9ab1b93
7eba57d9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!48
Review use of Materialize
Pipeline
#2479
passed
4 years ago
Stage: test
Stage: build
Changes
4
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+7
-0
7 additions, 0 deletions
.gitlab-ci.yml
poetry.lock
+1794
-284
1794 additions, 284 deletions
poetry.lock
pyproject.toml
+25
-0
25 additions, 0 deletions
pyproject.toml
tox.ini
+82
-0
82 additions, 0 deletions
tox.ini
with
1908 additions
and
284 deletions
.gitlab-ci.yml
0 → 100644
+
7
−
0
View file @
ddf52a36
include
:
-
project
:
"
AlekSIS/official/AlekSIS"
file
:
/ci/general.yml
-
project
:
"
AlekSIS/official/AlekSIS"
file
:
/ci/test.yml
-
project
:
"
AlekSIS/official/AlekSIS"
file
:
/ci/build_dist.yml
This diff is collapsed.
Click to expand it.
poetry.lock
+
1794
−
284
View file @
ddf52a36
This diff is collapsed.
Click to expand it.
pyproject.toml
+
25
−
0
View file @
ddf52a36
...
...
@@ -24,6 +24,31 @@ python = "^3.7"
AlekSIS
=
"^2.0a2"
AlekSIS-App-Chronos
=
"^2.0a2"
[tool.poetry.dev-dependencies]
sphinx
=
"^3.0"
sphinxcontrib-django
=
"^0.5.0"
sphinx-autodoc-typehints
=
"^1.7"
django-stubs
=
"^1.1"
pytest
=
"^5.3"
pytest-django
=
"^3.7"
pytest-django-testing-postgresql
=
"^0.1"
selenium
=
"^3.141.0"
safety
=
"^1.8.5"
flake8
=
"^3.7.9"
flake8-django
=
"^1.0.0"
flake8-fixme
=
"^1.1.1"
flake8-mypy
=
"^17.8.0"
flake8-bandit
=
"^2.1.2"
flake8-builtins
=
"^1.4.1"
flake8-docstrings
=
"^1.5.0"
flake8-rst-docstrings
=
"^0.0.13"
black
=
"^19.10b0"
flake8-black
=
"^0.2.0"
isort
=
"^4.3.21"
flake8-isort
=
"^3.0.0"
pytest-cov
=
"^2.8.1"
pytest-sugar
=
"^0.9.2"
[build-system]
requires
=
["poetry>
=
1.0
"]
build-backend
=
"poetry.masonry.api"
This diff is collapsed.
Click to expand it.
tox.ini
0 → 100644
+
82
−
0
View file @
ddf52a36
[tox]
skipsdist
=
True
skip_missing_interpreters
=
true
envlist
=
py37,py38
[testenv]
whitelist_externals
=
poetry
sudo
skip_install
=
true
envdir
=
{toxworkdir}/globalenv
commands_pre
=
-
poetry
install
commands
=
-
poetry
run
pytest
--cov
=
. {posargs} aleksis/
[testenv:selenium]
setenv
=
TEST_SCREENSHOT_PATH
=
{env:TEST_SCREENSHOT_PATH:.tox/screenshots}
TEST_SELENIUM_HUB
=
{env:TEST_SELENIUM_HUB:http://127.0.0.1:4444/wd/hub}
TEST_SELENIUM_BROWSERS
=
{env:TEST_SELENIUM_BROWSERS:chrome,firefox}
TEST_HOST
=
{env:TEST_HOST:172.17.0.1}
[testenv:lint]
commands
=
-
poetry
run
black
--check
--diff
aleksis/
--exclude
"migrations"
-
poetry
run
isort
-c
--diff
--stdout
-rc
-s
migrations
aleksis/
-
poetry
run
flake8
{posargs}
--exclude-from-doctest
migrations
aleksis/
[testenv:security]
commands
=
poetry
show
--no-dev
poetry
run
safety
check
--full-report
[testenv:build]
commands_pre
=
commands
=
poetry build
[testenv:docs]
commands
=
poetry run make -C docs/ html {posargs}
[testenv:reformat]
commands
=
poetry
run
isort
-rc
aleksis/
poetry
run
black
aleksis/
[flake8]
max_line_length
=
100
exclude
=
migrations,tests
ignore
=
BLK100,E203,E231,W503,D100,D101,D102,D103,D104,D105,D106,D107,RST215,RST214,F821,F841,S106,T100,T101,DJ05
[isort]
line_length
=
100
multi_line_output
=
3
include_trailing_comma
=
1
use_parantheses
=
1
default_section
=
THIRDPARTY
known_first_party
=
aleksis
known_django
=
django
sections
=
FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
[mypy]
plugins
=
mypy_django_plugin.main
python_version
=
3.8
platform
=
linux
show_column_numbers
=
True
follow_imports
=
skip
ignore_missing_imports
=
True
cache_dir
=
/dev/null
[mypy.plugins.django-stubs]
django_settings_module
=
aleksis.core.settings
[pytest]
DJANGO_SETTINGS_MODULE
=
aleksis.core.settings
junit_family
=
legacy
[coverage:run]
omit
=
*/migrations/*
*/tests/*
.tox/*
manage.py
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment