diff --git a/.eslintrc.js b/.eslintrc.js
index 996cd5aad4d7331e9c74dcaa7eb6483a5116eed9..60317f4987d885fc380d731c6dd8792325342f44 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,7 +2,6 @@ module.exports = {
extends: [
"eslint:recommended",
"plugin:vue/strongly-recommended",
- // "plugin:prettier/recommended",
"plugin:@intlify/vue-i18n/recommended",
],
rules: {
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index cd41b2852982abd25bb9278a7610c55625a97e22..4fed9bc57cdf05f45aa7ba8faac411e9995fe4ff 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,6 +9,14 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
+`3.0.1`_ - 2023-07-20
+---------------------
+
+Fixed
+~~~~~
+
+* [Dev] Sample data were broken due to using old room model.
+
`3.0`_ - 2023-05-14
-------------------
@@ -387,3 +395,5 @@ Fixed
.. _2.5: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.5
.. _3.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/3.0b0
.. _3.0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/3.0
+.. _3.0.1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/3.0.1
+
diff --git a/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po b/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po
index c444d4fed82cb1365fb36a478c18f3fdcde4ab46..2e3d3057579d8be2e8deb28753aa9446c82ca06e 100644
--- a/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po
+++ b/aleksis/apps/chronos/locale/ru/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-21 11:32+0200\n"
-"PO-Revision-Date: 2023-02-08 22:40+0000\n"
+"PO-Revision-Date: 2023-05-26 04:38+0000\n"
"Last-Translator: Serhii Horichenko <m@sgg.im>\n"
"Language-Team: Russian <https://translate.edugit.org/projects/aleksis/aleksis-app-chronos/ru/>\n"
"Language: ru\n"
@@ -75,7 +75,7 @@ msgstr "Учебный год"
#: aleksis/apps/chronos/models.py:89 aleksis/apps/chronos/models.py:699
msgid "Name"
-msgstr "ИмÑ"
+msgstr "Полное имÑ"
#: aleksis/apps/chronos/models.py:91 aleksis/apps/chronos/models.py:754
#: aleksis/apps/chronos/models.py:829 aleksis/apps/chronos/models.py:1063
diff --git a/docs/conf.py b/docs/conf.py
index 7c7d6663eee95986b6bffa895304dd549a9ec823..743bdf5de706d498d24775f49dd925ab819d70dd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
# The short X.Y version
version = "3.0"
# The full version, including alpha/beta/rc tags
-release = "3.0.1.dev0"
+release = "3.0.2.dev0"
# -- General configuration ---------------------------------------------------
diff --git a/fixtures/highschool-de-20212022.json b/fixtures/highschool-de-20212022.json
index 89537eb8c81ad05e25f3757aa34bf75b8c1235c7..08ab534c2242a3c6524fe68c663b7c15051870c7 100644
--- a/fixtures/highschool-de-20212022.json
+++ b/fixtures/highschool-de-20212022.json
@@ -19513,7 +19513,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 72,
"fields": {
"site": 1,
@@ -19525,7 +19525,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 73,
"fields": {
"site": 1,
@@ -19537,7 +19537,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 74,
"fields": {
"site": 1,
@@ -19549,7 +19549,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 75,
"fields": {
"site": 1,
@@ -19561,7 +19561,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 76,
"fields": {
"site": 1,
@@ -19573,7 +19573,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 77,
"fields": {
"site": 1,
@@ -19585,7 +19585,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 78,
"fields": {
"site": 1,
@@ -19597,7 +19597,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 79,
"fields": {
"site": 1,
@@ -19609,7 +19609,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 80,
"fields": {
"site": 1,
@@ -19621,7 +19621,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 81,
"fields": {
"site": 1,
@@ -19633,7 +19633,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 82,
"fields": {
"site": 1,
@@ -19645,7 +19645,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 83,
"fields": {
"site": 1,
@@ -19657,7 +19657,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 84,
"fields": {
"site": 1,
@@ -19669,7 +19669,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 85,
"fields": {
"site": 1,
@@ -19681,7 +19681,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 86,
"fields": {
"site": 1,
@@ -19693,7 +19693,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 87,
"fields": {
"site": 1,
@@ -19705,7 +19705,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 88,
"fields": {
"site": 1,
@@ -19717,7 +19717,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 89,
"fields": {
"site": 1,
@@ -19729,7 +19729,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 90,
"fields": {
"site": 1,
@@ -19741,7 +19741,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 91,
"fields": {
"site": 1,
@@ -19753,7 +19753,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 92,
"fields": {
"site": 1,
@@ -19765,7 +19765,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 93,
"fields": {
"site": 1,
@@ -19777,7 +19777,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 94,
"fields": {
"site": 1,
@@ -19789,7 +19789,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 95,
"fields": {
"site": 1,
@@ -19801,7 +19801,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 96,
"fields": {
"site": 1,
@@ -19813,7 +19813,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 97,
"fields": {
"site": 1,
@@ -19825,7 +19825,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 98,
"fields": {
"site": 1,
@@ -19837,7 +19837,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 99,
"fields": {
"site": 1,
@@ -19849,7 +19849,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 100,
"fields": {
"site": 1,
@@ -19861,7 +19861,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 101,
"fields": {
"site": 1,
@@ -19873,7 +19873,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 102,
"fields": {
"site": 1,
@@ -19885,7 +19885,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 103,
"fields": {
"site": 1,
@@ -19897,7 +19897,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 104,
"fields": {
"site": 1,
@@ -19909,7 +19909,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 105,
"fields": {
"site": 1,
@@ -19921,7 +19921,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 106,
"fields": {
"site": 1,
@@ -19933,7 +19933,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 107,
"fields": {
"site": 1,
@@ -19945,7 +19945,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 108,
"fields": {
"site": 1,
@@ -19957,7 +19957,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 109,
"fields": {
"site": 1,
@@ -19969,7 +19969,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 110,
"fields": {
"site": 1,
@@ -19981,7 +19981,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 111,
"fields": {
"site": 1,
@@ -19993,7 +19993,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 112,
"fields": {
"site": 1,
@@ -20005,7 +20005,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 113,
"fields": {
"site": 1,
@@ -20017,7 +20017,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 114,
"fields": {
"site": 1,
@@ -20029,7 +20029,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 115,
"fields": {
"site": 1,
@@ -20041,7 +20041,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 116,
"fields": {
"site": 1,
@@ -20053,7 +20053,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 117,
"fields": {
"site": 1,
@@ -20065,7 +20065,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 118,
"fields": {
"site": 1,
@@ -20077,7 +20077,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 119,
"fields": {
"site": 1,
@@ -20089,7 +20089,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 120,
"fields": {
"site": 1,
@@ -20101,7 +20101,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 121,
"fields": {
"site": 1,
@@ -20113,7 +20113,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 122,
"fields": {
"site": 1,
@@ -20125,7 +20125,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 123,
"fields": {
"site": 1,
@@ -20137,7 +20137,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 124,
"fields": {
"site": 1,
@@ -20149,7 +20149,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 125,
"fields": {
"site": 1,
@@ -20161,7 +20161,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 126,
"fields": {
"site": 1,
@@ -20173,7 +20173,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 127,
"fields": {
"site": 1,
@@ -20185,7 +20185,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 128,
"fields": {
"site": 1,
@@ -20197,7 +20197,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 129,
"fields": {
"site": 1,
@@ -20209,7 +20209,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 130,
"fields": {
"site": 1,
@@ -20221,7 +20221,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 131,
"fields": {
"site": 1,
@@ -20233,7 +20233,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 132,
"fields": {
"site": 1,
@@ -20245,7 +20245,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 133,
"fields": {
"site": 1,
@@ -20257,7 +20257,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 134,
"fields": {
"site": 1,
@@ -20269,7 +20269,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 135,
"fields": {
"site": 1,
@@ -20281,7 +20281,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 136,
"fields": {
"site": 1,
@@ -20293,7 +20293,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 137,
"fields": {
"site": 1,
@@ -20305,7 +20305,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 138,
"fields": {
"site": 1,
@@ -20317,7 +20317,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 139,
"fields": {
"site": 1,
@@ -20329,7 +20329,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 140,
"fields": {
"site": 1,
@@ -20341,7 +20341,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 141,
"fields": {
"site": 1,
@@ -20353,7 +20353,7 @@
}
},
{
- "model": "chronos.room",
+ "model": "core.room",
"pk": 142,
"fields": {
"site": 1,
diff --git a/pyproject.toml b/pyproject.toml
index f1aff7e87143b4bb98d8be89280475d7759446a2..26dbd51a260ebfc9741629fb2d1d9361b0c664d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "AlekSIS-App-Chronos"
-version = "3.0.1.dev0"
+version = "3.0.2.dev0"
packages = [
{ include = "aleksis" }
]
@@ -24,12 +24,9 @@ authors = [
"Hangzhi Yu <yuha@katharineum.de>",
"Lloyd Meins <meinsll@katharineum.de>"
]
-maintainers = [
- "Jonathan Weth <wethjo@katharineum.de>",
- "Dominik George <dominik.george@teckids.org>"
-]
+maintainers = ["Jonathan Weth <dev@jonathanweth.de>", "Dominik George <dominik.george@teckids.org>"]
license = "EUPL-1.2-or-later"
-homepage = "https://aleksis.org/"
+homepage = "https://aleksis.org"
repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos"
documentation = "https://aleksis.org/AlekSIS/docs/html/"
keywords = ["SIS", "education", "school", "timetable", "plans"]
@@ -42,27 +39,69 @@ classifiers = [
"Typing :: Typed",
]
+[[tool.poetry.source]]
+name = "PyPI"
+priority = "primary"
+
[[tool.poetry.source]]
name = "gitlab"
url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
-secondary = true
-
+priority = "supplemental"
[tool.poetry.dependencies]
python = "^3.9"
calendarweek = "^0.5.0"
aleksis-core = "^3.0"
aleksis-app-resint = "^3.0"
-[tool.poetry.dev-dependencies]
-aleksis-builddeps = "*"
-
[tool.poetry.plugins."aleksis.app"]
chronos = "aleksis.apps.chronos.apps:ChronosConfig"
+
+[tool.poetry.group.dev.dependencies]
+django-stubs = "^4.2"
+
+safety = "^2.3.5"
+
+flake8 = "^6.0.0"
+flake8-django = "~1.2"
+flake8-fixme = "^1.1.1"
+flake8-mypy = "^17.8.0"
+flake8-bandit = "^4.1.1"
+flake8-builtins = "^2.0.0"
+flake8-docstrings = "^1.5.0"
+flake8-rst-docstrings = "^0.3.0"
+
+black = ">=21.0"
+flake8-black = "^0.3.0"
+
+isort = "^5.0.0"
+flake8-isort = "^6.0.0"
+
+curlylint = "^0.13.0"
+
+[tool.poetry.group.test.dependencies]
+pytest = "^7.2"
+pytest-django = "^4.1"
+pytest-django-testing-postgresql = "^0.2"
+pytest-cov = "^4.0.0"
+pytest-sugar = "^0.9.2"
+selenium = "<4.10.0"
+freezegun = "^1.1.0"
+
+[tool.poetry.group.docs]
+optional = true
+
+[tool.poetry.group.docs.dependencies]
+sphinx = "^7.0"
+sphinxcontrib-django = "^2.3.0"
+sphinxcontrib-svg2pdfconverter = "^1.1.1"
+sphinx-autodoc-typehints = "^1.7"
+sphinx_material = "^0.0.35"
+
[tool.black]
line-length = 100
exclude = "/migrations/"
[build-system]
-requires = ["poetry>=1.0"]
-build-backend = "poetry.masonry.api"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"