From 7302aa76bf5c63b897611086b618b261d8e651a1 Mon Sep 17 00:00:00 2001
From: Aleksolotl <aleksolotl@aleksis.org>
Date: Fri, 6 Dec 2024 18:16:50 +0000
Subject: [PATCH 1/4] Update pyproject.toml
---
pyproject.toml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pyproject.toml b/pyproject.toml
index 299716f..a9860cc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,7 +77,6 @@ sphinxcontrib-django = "^2.3.0"
sphinxcontrib-svg2pdfconverter = "^1.1.1"
sphinx-autodoc-typehints = "^1.7"
sphinx_material = "^0.0.35"
-
[tool.ruff]
exclude = ["migrations", "tests"]
line-length = 100
--
GitLab
From 1909e48026c6932fdbefcd57f34e2347049f4fcd Mon Sep 17 00:00:00 2001
From: Aleksolotl <aleksolotl@aleksis.org>
Date: Fri, 6 Dec 2024 19:06:21 +0000
Subject: [PATCH 2/4] Update pyproject.toml
---
pyproject.toml | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index a9860cc..01abd6b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ include = [
description = "AlekSIS (School Information System) — App Dashboard Feeds (Include feeds from external resources as widgets on dashboard)"
authors = ["Julian Leucker <leuckerj@gmail.com>", "Dominik George <dominik.george@teckids.org>"]
-maintainers = ["Jonathan Weth <dev@jonathanweth.de>", "Dominik George <dominik.george@teckids.org>"]
+maintainers = ["Jonathan Weth <jonathan.weth@teckids.org>", "Dominik George <dominik.george@teckids.org>"]
license = "EUPL-1.2-or-later"
homepage = "https://aleksis.org"
repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-DashboardFeeds"
@@ -55,18 +55,16 @@ dashboardfeeds = "aleksis.apps.dashboardfeeds.apps:DefaultConfig"
django-stubs = "^4.2"
safety = "^2.3.5"
-ruff = "^0.1.5"
-
-curlylint = "^0.13.0"
+ruff = "^0.8.2"
[tool.poetry.group.test.dependencies]
-pytest = "^7.2"
-pytest-django = "^4.1"
+pytest = "^8.3"
+pytest-django = "^4.9"
pytest-django-testing-postgresql = "^0.2"
-pytest-cov = "^4.0.0"
-pytest-sugar = "^0.9.2"
-selenium = "<4.10.0"
-freezegun = "^1.1.0"
+pytest-cov = "^6.0.0"
+pytest-sugar = "^1.0.0"
+selenium = "^4.27.0"
+freezegun = "^1.5.0"
[tool.poetry.group.docs]
optional = true
@@ -78,12 +76,20 @@ sphinxcontrib-svg2pdfconverter = "^1.1.1"
sphinx-autodoc-typehints = "^1.7"
sphinx_material = "^0.0.35"
[tool.ruff]
-exclude = ["migrations", "tests"]
+exclude = ["migrations"]
line-length = 100
[tool.ruff.lint]
select = ["E", "F", "UP", "B", "SIM", "I", "DJ", "A", "S"]
ignore = ["UP034", "UP015", "B028"]
+[tool.ruff.lint.extend-per-file-ignores]
+"**/*/tests/**/*.py" = ["S101", "ARG", "FBT", "PLR2004", "S311", "S105"]
+[tool.ruff.lint.isort]
+known-first-party = ["aleksis"]
+section-order = ["future", "standard-library", "django", "third-party", "first-party", "local-folder"]
+
+[tool.ruff.lint.isort.sections]
+django = ["django"]
[tool.ruff.isort]
known-first-party = ["aleksis"]
--
GitLab
From cf1661e75622cd1cf94ebc326b35f29afb8a5e59 Mon Sep 17 00:00:00 2001
From: Aleksolotl <aleksolotl@aleksis.org>
Date: Fri, 6 Dec 2024 20:07:22 +0000
Subject: [PATCH 3/4] Update pyproject.toml
---
pyproject.toml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 01abd6b..7ccbc93 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -90,13 +90,6 @@ section-order = ["future", "standard-library", "django", "third-party", "first-p
[tool.ruff.lint.isort.sections]
django = ["django"]
-
-[tool.ruff.isort]
-known-first-party = ["aleksis"]
-section-order = ["future", "standard-library", "django", "third-party", "first-party", "local-folder"]
-
-[tool.ruff.isort.sections]
-django = ["django"]
[build-system]
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"
--
GitLab
From 6613f086fe3a94ec9628afd03416d5dd5dc1ff3b Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 8 Dec 2024 21:05:42 +0100
Subject: [PATCH 4/4] Fix lint
---
aleksis/apps/dashboardfeeds/util/event_feed.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/aleksis/apps/dashboardfeeds/util/event_feed.py b/aleksis/apps/dashboardfeeds/util/event_feed.py
index a75b244..1ddbe5b 100644
--- a/aleksis/apps/dashboardfeeds/util/event_feed.py
+++ b/aleksis/apps/dashboardfeeds/util/event_feed.py
@@ -14,13 +14,11 @@ def get_current_events(calendar: Calendar, limit: int = 5) -> list:
:param limit: Count of events
:return: List of upcoming events
"""
- i: int = 0
events: list = []
- for event in calendar.timeline.start_after(timezone.now()):
+ for i, event in enumerate(calendar.timeline.start_after(timezone.now())):
# Check for limit
if i >= limit:
break
- i += 1
if event.all_day:
# The last day in all day events is excluded
--
GitLab