linting, upgrading gh-actions, upgrading django-packages, removed lea…

…flet

.dockerignore

@@ -3,4 +3,6 @@ env
 db.sqlite3
 .env
 env.default
-*.sql
+*.sql
+.git
+/venv

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-ignore = D203 W504
+ignore = D203 W504 W503
 max-line-length = 120
 exclude =
     */migrations,
@@ -11,4 +11,5 @@ exclude =
     dist
     env
     appcreator
-    webpage
+    webpage
+    venv

.github/workflows/build.yml

@@ -17,26 +17,26 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

.github/workflows/lint.yml

@@ -8,10 +8,10 @@ jobs:
     name: Lint
     steps:
       - name: Check out source repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python environment
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.12"
       - name: flake8 Lint
-        uses: py-actions/flake8@v1
+        uses: py-actions/flake8@v2

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
       POSTGRES_DB: github_actions
     services:
       postgres:
-        image: postgres:13
+        image: postgres:16
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
@@ -19,17 +19,15 @@ jobs:
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - uses: actions/checkout@v4
+    - name: Set up Python 12
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
-    - uses: actions/cache@v2
+        python-version: "3.12"
+    - uses: actions/cache@v4
       with:
         path: ${{ env.pythonLocation }}
         key: ${{ env.pythonLocation }}-${{ hashFiles('requirements_dev.txt') }}
-    - name: GDAL
-      run: sudo apt-get install postgresql-common libpq-dev python3-gdal
     - name: Install dependencies
       run: |
         pip install --upgrade --upgrade-strategy eager -r requirements_dev.txt
@@ -40,8 +38,8 @@ jobs:
     - name: Create Coverage Report
       run: coverage xml
     - name: "Upload coverage to Codecov"
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
       with:
         token: ${{secrets.CODECOV_TOKEN}}
         file: ./coverage.xml
-        fail_ci_if_error: true
+        fail_ci_if_error: false

.gitignore

@@ -46,4 +46,5 @@ key.pub
 bin/
 pg_hba.conf
 lib64
-*sql
+*sql
+/venv

archiv/dal_views.py

@@ -1,14 +1,7 @@
 # generated by appcreator
 from django.db.models import Q
 from dal import autocomplete
-from . models import (
-    Event,
-    Work,
-    Person,
-    Place,
-    Institution,
-    Wab
-)
+from .models import Event, Work, Person, Place, Institution, Wab
 
 
 class PersonAC(autocomplete.Select2QuerySetView):
@@ -17,9 +10,9 @@ def get_queryset(self):
 
         if self.q:
             qs = qs.filter(
-                Q(title__icontains=self.q) |
-                Q(gnd_gnd_id=self.q) |
-                Q(gnd_pref_name=self.q)
+                Q(title__icontains=self.q)
+                | Q(gnd_gnd_id=self.q)
+                | Q(gnd_pref_name=self.q)
             )
         return qs
 
@@ -29,9 +22,7 @@ def get_queryset(self):
         qs = Place.objects.all()
 
         if self.q:
-            qs = qs.filter(
-                Q(title__icontains=self.q)
-            )
+            qs = qs.filter(Q(title__icontains=self.q))
         return qs
 
 
@@ -40,9 +31,7 @@ def get_queryset(self):
         qs = Wab.objects.all()
 
         if self.q:
-            qs = qs.filter(
-                Q(title__icontains=self.q)
-            )
+            qs = qs.filter(Q(title__icontains=self.q))
         return qs
 
 
@@ -51,9 +40,7 @@ def get_queryset(self):
         qs = Institution.objects.all()
 
         if self.q:
-            qs = qs.filter(
-                Q(title__icontains=self.q)
-            )
+            qs = qs.filter(Q(title__icontains=self.q))
         return qs
 
 
@@ -62,10 +49,7 @@ def get_queryset(self):
         qs = Event.objects.all()
 
         if self.q:
-            qs = qs.filter(
-                Q(id__icontains=self.q) |
-                Q(full_text__icontains=self.q)
-            )
+            qs = qs.filter(Q(id__icontains=self.q) | Q(full_text__icontains=self.q))
         return qs
 
 
@@ -75,7 +59,6 @@ def get_queryset(self):
 
         if self.q:
             qs = qs.filter(
-                Q(order_code__icontains=self.q) |
-                Q(full_quote__icontains=self.q)
+                Q(order_code__icontains=self.q) | Q(full_quote__icontains=self.q)
             )
         return qs

archiv/data_views.py

@@ -9,15 +9,15 @@ def event_calendar_data(request):
     data = []
     for x in Event.objects.exclude(not_before__isnull=True):
         item = {
-            'id': x.date_written,
-            'name': f"{x}",
-            'startDate': f"{x.not_before}",
-            'linkId': x.get_absolute_url()
+            "id": x.date_written,
+            "name": f"{x}",
+            "startDate": f"{x.not_before}",
+            "linkId": x.get_absolute_url(),
         }
         data.append(item)
     var_data = f"var calendarData = {json.dumps(data, ensure_ascii=False)}"
     return HttpResponse(var_data, content_type="text/javascript")
 
 
 class EventCalendarView(TemplateView):
-    template_name = 'archiv/event_calendar.html'
+    template_name = "archiv/event_calendar.html"

archiv/import_utils.py

@@ -4,14 +4,14 @@
 
 
 def field_mapping(some_class):
-    """ returns a dictionary mapping model field names to lookukp values
-        :param some_class: Any django model class with extra field properties
-        :return: A dict mapping model field names to lookukp values
+    """returns a dictionary mapping model field names to lookukp values
+    :param some_class: Any django model class with extra field properties
+    :return: A dict mapping model field names to lookukp values
     """
     field_mapping_dict = {}
     for x in some_class._meta.get_fields():
         try:
-            field_mapping_dict[(x.extra['data_lookup']).strip()] = x.name
+            field_mapping_dict[(x.extra["data_lookup"]).strip()] = x.name
         except:  # noqa: E722
             pass
     return field_mapping_dict

archiv/management/commands/bruckner_entities.py

@@ -12,43 +12,47 @@
 NS_LIST = {
     "tei": "http://www.tei-c.org/ns/1.0",
     "mei": "http://www.music-encoding.org/ns/mei",
-    "xml": "http://www.w3.org/XML/1998/namespace"
+    "xml": "http://www.w3.org/XML/1998/namespace",
 }
 
 
 class Command(BaseCommand):
-    help = 'Enriches Persons with bruckner_entities_xml data'
+    help = "Enriches Persons with bruckner_entities_xml data"
 
     def handle(self, *args, **kwargs):
-        headers = {
-            "PRIVATE-TOKEN": settings.GITLAB_TOKEN
-        }
+        headers = {"PRIVATE-TOKEN": settings.GITLAB_TOKEN}
         r = requests.get(settings.BRUCKNER_PERSON_URL, headers=headers)
-        content = r.content.decode('utf-8')
-        content = content.replace('http://www.music-encoding.org/ns/mei', 'http://www.tei-c.org/ns/1.0')
+        content = r.content.decode("utf-8")
+        content = content.replace(
+            "http://www.music-encoding.org/ns/mei", "http://www.tei-c.org/ns/1.0"
+        )
         doc = TeiReader(content)
-        person_entries = doc.any_xpath('.//tei:persName[@xml:id]')
+        person_entries = doc.any_xpath(".//tei:persName[@xml:id]")
         for x in tqdm(person_entries, total=len(person_entries)):
             item = {}
-            item['xml_id'] = x.attrib['{http://www.w3.org/XML/1998/namespace}id']
+            item["xml_id"] = x.attrib["{http://www.w3.org/XML/1998/namespace}id"]
             try:
-                item['last_name'] = x.xpath('.//tei:famName/text()', namespaces=NS_LIST)[0]
+                item["last_name"] = x.xpath(
+                    ".//tei:famName/text()", namespaces=NS_LIST
+                )[0]
             except IndexError:
-                item['last_name'] = ''
+                item["last_name"] = ""
             try:
-                item['first_name'] = x.xpath('.//tei:foreName/text()', namespaces=NS_LIST)[0]
+                item["first_name"] = x.xpath(
+                    ".//tei:foreName/text()", namespaces=NS_LIST
+                )[0]
             except IndexError:
-                item['first_name'] = ''
-            item['label'] = f"{item['first_name'].strip()} {item['last_name'].strip()}"
-            item['xml_node'] = ET.tostring(x)
+                item["first_name"] = ""
+            item["label"] = f"{item['first_name'].strip()} {item['last_name'].strip()}"
+            item["xml_node"] = ET.tostring(x)
             try:
-                pers = Person.objects.get(title=item['label'])
+                pers = Person.objects.get(title=item["label"])
             except ObjectDoesNotExist:
                 pers, _ = Person.objects.get_or_create(
-                    bruckner_entity_id=item['xml_id']
+                    bruckner_entity_id=item["xml_id"]
                 )
-                pers.title = item['label']
+                pers.title = item["label"]
             pers.bruckner_entity = True
-            pers.bruckner_entity_id = item['xml_id']
-            pers.bruckner_entity_xml = item['xml_node'].decode('utf-8')
+            pers.bruckner_entity_id = item["xml_id"]
+            pers.bruckner_entity_xml = item["xml_node"].decode("utf-8")
             pers.save()

archiv/management/commands/event_wab.py

@@ -9,7 +9,7 @@
 
 
 class Command(BaseCommand):
-    help = 'Links WAB to Events based on Wab-Titles'
+    help = "Links WAB to Events based on Wab-Titles"
 
     def handle(self, *args, **kwargs):
         sheet_id = settings.WAB_SEARCH
@@ -20,10 +20,10 @@ def handle(self, *args, **kwargs):
             try:
                 wab = Wab.objects.get(wab_id=wab_id)
             except ObjectDoesNotExist:
-                data.append([wab_id, row['match_str'], 0])
+                data.append([wab_id, row["match_str"], 0])
                 continue
-            matches = Event.objects.filter(main_text__contains=row['match_str'])
+            matches = Event.objects.filter(main_text__contains=row["match_str"])
             wab.rvn_wab_mentioned_in.add(*matches)
-            data.append([wab_id, row['match_str'], matches.count()])
-        out_df = pd.DataFrame(data, columns=['wab', 'search_str', 'matches'])
-        out_df.to_csv('./media/wab_matching.csv', index=False)
+            data.append([wab_id, row["match_str"], matches.count()])
+        out_df = pd.DataFrame(data, columns=["wab", "search_str", "matches"])
+        out_df.to_csv("./media/wab_matching.csv", index=False)

archiv/management/commands/fix_encoding.py

@@ -6,7 +6,7 @@
 
 
 class Command(BaseCommand):
-    help = 'Fix wrong encoding of latin chars'
+    help = "Fix wrong encoding of latin chars"
 
     def handle(self, *args, **kwargs):
         fields = Event.search_field_names()
@@ -17,7 +17,7 @@ def handle(self, *args, **kwargs):
                 old = getattr(x, f)
                 if old is not None:
                     for i, row in df.iterrows():
-                        old = old.replace(row['from'], row['to'])
+                        old = old.replace(row["from"], row["to"])
                 setattr(x, f, old)
             x.save()
         print("done")

archiv/management/commands/fix_stichworte.py

@@ -8,19 +8,19 @@
 
 
 class Command(BaseCommand):
-    help = 'Imports text_Stichworte Data'
+    help = "Imports text_Stichworte Data"
 
     def handle(self, *args, **kwargs):
         sheet_id = settings.LEGACY_DB_SHEET_ID
         self.stdout.write(f"fetching data from {sheet_id}")
         df = gsheet_to_df(sheet_id)
-        df = df.dropna(subset=['text_Stichworte', 'input_Sortiercode'])
+        df = df.dropna(subset=["text_Stichworte", "input_Sortiercode"])
         for i, row in tqdm(df.iterrows(), total=len(df)):
             try:
-                event = Event.objects.get(id=row['input_Sortiercode'])
+                event = Event.objects.get(id=row["input_Sortiercode"])
             except ObjectDoesNotExist:
                 continue
-            stichwort = row['text_Stichworte']
+            stichwort = row["text_Stichworte"]
             event.key_word = stichwort
             event.save()
         self.stdout.write("done")