From 1f4116712610e269a8c5ebdf09e837ba8e8dae1a Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 6 Mar 2022 20:12:09 +0100
Subject: [PATCH] Reformat and fix dependencies
---
.gitlab-ci.yml | 6 ++++--
aleksis/apps/tezor/apps.py | 4 +---
aleksis/apps/tezor/menus.py | 3 +--
aleksis/apps/tezor/models/invoice.py | 8 ++++++--
pyproject.toml | 1 +
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f98ddb..b97f64f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,13 @@ include:
file: /ci/general.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/prepare/lock.yml
-# - project: "AlekSIS/official/AlekSIS"
-# file: /ci/test.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/lint.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/security.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/build/dist.yml
+ - project: "AlekSIS/official/AlekSIS"
+ file: /ci/publish/pypi.yml
+ - project: "AlekSIS/official/AlekSIS"
+ file: /ci/docker/image.yml
diff --git a/aleksis/apps/tezor/apps.py b/aleksis/apps/tezor/apps.py
index 117588f..91be7bb 100644
--- a/aleksis/apps/tezor/apps.py
+++ b/aleksis/apps/tezor/apps.py
@@ -10,6 +10,4 @@ class DefaultConfig(AppConfig):
"Repository": "https://edugit.org/AlekSIS/onboarding//AlekSIS-App-Tezor",
}
licence = "EUPL-1.2+"
- copyright_info = (
- ([2022], "Dominik George", "dominik.george@teckids.org"),
- )
+ copyright_info = (([2022], "Dominik George", "dominik.george@teckids.org"),)
diff --git a/aleksis/apps/tezor/menus.py b/aleksis/apps/tezor/menus.py
index ad4e680..0fbbd2e 100644
--- a/aleksis/apps/tezor/menus.py
+++ b/aleksis/apps/tezor/menus.py
@@ -10,8 +10,7 @@ MENUS = {
"menu_generator.validators.is_authenticated",
"aleksis.core.util.core_helpers.has_person",
],
- "submenu": [
- ],
+ "submenu": [],
}
]
}
diff --git a/aleksis/apps/tezor/models/invoice.py b/aleksis/apps/tezor/models/invoice.py
index 9c82d15..4b4c6d0 100644
--- a/aleksis/apps/tezor/models/invoice.py
+++ b/aleksis/apps/tezor/models/invoice.py
@@ -10,7 +10,9 @@ from .base import Client
class InvoiceGroup(ExtensibleModel):
name = models.CharField(verbose_name=_("Invoice group name"), max_length=255)
- client = models.ForeignKey(Client, verbose_name=_("Linked client"), related_name="invoice_groups")
+ client = models.ForeignKey(
+ Client, verbose_name=_("Linked client"), related_name="invoice_groups"
+ )
class Meta:
constraints = [
@@ -19,7 +21,9 @@ class InvoiceGroup(ExtensibleModel):
class Invoice(ExtensibleModel):
- group = models.ForeignKey(InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices")
+ group = models.ForeignKey(
+ InvoiceGroup, verbose_name=_("Invoice group"), related_name="invoices"
+ )
number = models.CharField(verbose_name=_("Invoice number"))
date = models.DateField(verbose_name=_("Invoice date"))
diff --git a/pyproject.toml b/pyproject.toml
index f30ab49..f770a12 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,6 +31,7 @@ secondary = true
[tool.poetry.dependencies]
python = "^3.9"
aleksis-core = "^2.7"
+django-money = "^2.1.1"
[tool.poetry.dev-dependencies]
aleksis-builddeps = "*"
--
GitLab