Merge pull request #4 from eduralph/feature/ci-cd-pipeline

eduralph · web-flow · commit 75d9702018d2 · 2026-04-17T20:55:23.000+02:00
Fix CI failures: lint, compile, addon structure, Windows install
diff --git a/.github/environment.yml b/.github/environment.yml
@@ -0,0 +1,13 @@
+name: addons-ci
+channels:
+  - conda-forge
+dependencies:
+  - python=3.12
+  - pygobject
+  - gtk3
+  - pip
+  - pip:
+      - "gramps>=6.0,<6.1"
+      - orjson
+      - pytest
+      - dbf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,6 +70,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Compile all Python files (excluding .gpr.py)
+        shell: bash
         run: |
           failed=0
           while IFS= read -r f; do
@@ -126,12 +127,15 @@ jobs:
         uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
-          python-version: "3.12"
           activate-environment: addons-ci
-          channels: conda-forge
+          environment-file: .github/environment.yml
+          use-mamba: true
 
-      - name: Install Gramps + test deps
-        run: mamba install -y "gramps>=6.0,<6.1" pygobject gtk3 orjson pytest dbf
+      - name: Verify environment
+        run: |
+          mamba info
+          mamba list | head -30
+          python -c "import pytest, gramps, gi; print('deps OK')"
 
       - name: Run per-addon unit tests
         env:
diff --git a/AnniversariesGramplet/AnniversariesGramplet.py b/AnniversariesGramplet/AnniversariesGramplet.py
@@ -26,6 +26,7 @@
 from gramps.gen.utils.db import get_participant_from_event
 from gramps.gen.datehandler import get_date
 from gramps.gen.config import config
+from gramps.gen.errors import WindowActiveError
 from gramps.gui.editors import EditEvent
 
 from gramps.gen.const import GRAMPS_LOCALE as glocale
diff --git a/AnniversariesGramplet/po/template.pot b/AnniversariesGramplet/po/template.pot
@@ -0,0 +1,18 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-04-17 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/ArchiveAssist/po/template.pot b/ArchiveAssist/po/template.pot
@@ -0,0 +1,18 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-04-17 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/AttachSourceTool/AttachSourceTool.py b/AttachSourceTool/AttachSourceTool.py
@@ -209,6 +209,3 @@ def create_source(self, source_text):
         self.db.add_source(source, self.trans)
         return source
 
-        self.db.add_event(event, self.trans)
-        return event
-
diff --git a/CombinedView/combinedview.py b/CombinedView/combinedview.py
@@ -54,7 +54,9 @@
 from personpage import PersonPage
 from eventpage import EventPage
 from gramps.gen.config import config
-from gramps.gen.lib import Family, ChildRef, Person
+from gramps.gen.lib import Family, ChildRef, Person, EventType
+from gramps.gen.utils.db import get_birth_or_fallback, get_death_or_fallback
+from gramps.gen.datehandler import get_date
 from gramps.gui.uimanager import ActionGroup
 from gramps.gui.selectors import SelectorFactory
 from gramps.gen.errors import WindowActiveError
diff --git a/DenominoViso/DenominoViso.py b/DenominoViso/DenominoViso.py
@@ -129,6 +129,7 @@
 from urllib.request import pathname2url
 from xml.sax.saxutils import escape, quoteattr
 from math import sin,cos,exp,sqrt,e,pi
+from functools import reduce
 import codecs
 
 #-------------------------------------------------------------------------
diff --git a/DescendantBooks/RunReport.py b/DescendantBooks/RunReport.py
@@ -38,6 +38,7 @@
 from gramps.gen.plug.report import CATEGORY_TEXT
 from gramps.gui.utils import open_file_with_default_application
 from gramps.gui.user import User
+from gramps.gui.dialog import ErrorDialog
 from gramps.gui.plug.report._textreportdialog import TextReportDialog
 
 
diff --git a/DescendantsLines/ft.py b/DescendantsLines/ft.py
@@ -31,6 +31,7 @@
 import xml.dom.minidom
 import getopt
 import sys
+from functools import reduce
 #-------------------------------------------------------------------------
 #
 # variables
diff --git a/DynamicWeb/dynamicweb.py b/DynamicWeb/dynamicweb.py
@@ -123,14 +123,9 @@
 import tarfile
 import tempfile
 
-if sys.version_info[0] < 3:
-    from cStringIO import StringIO
-
-    string_types = basestring
-else:
-    from io import StringIO
+from io import StringIO
 
-    string_types = str
+string_types = str
 from unicodedata import normalize
 from collections import defaultdict, OrderedDict
 from xml.sax.saxutils import escape
diff --git a/DynamicWeb/run_dynamicweb.py b/DynamicWeb/run_dynamicweb.py
@@ -44,9 +44,6 @@
 if (not os.path.exists(gramps_path)): raise Exception("Gramps path GRAMPS_RESOURCES not found")
 sys.path.insert(1, gramps_path)
 
-if sys.version_info[0] < 3:
-    reload(sys)
-    sys.setdefaultencoding('utf8')
 from dynamicweb import *
 from dynamicweb import _
 from report_sets import *
diff --git a/EditExifMetadata/editexifmetadata.py b/EditExifMetadata/editexifmetadata.py
@@ -574,7 +574,7 @@ def __create_button(self, text, callback=[], sensitive=False):
         """
         button = Gtk.Button(label=_(text))
 
-        if callback is not []:
+        if callback != []:
             for call_ in callback:
                 button.connect("clicked", call_)
 
diff --git a/Form/selectform.py b/Form/selectform.py
@@ -43,6 +43,7 @@
 #
 # ------------------------------------------------------------------------
 from gramps.gen.const import GRAMPS_LOCALE as glocale
+from gramps.gui.display import display_help
 
 try:
     _trans = glocale.get_addon_translator(__file__)
diff --git a/GrampsChat/po/template.pot b/GrampsChat/po/template.pot
@@ -0,0 +1,18 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-04-17 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/GrampsWebSync/diffhandler.py b/GrampsWebSync/diffhandler.py
@@ -26,6 +26,7 @@
 from datetime import datetime
 
 from gramps.gen.db.base import DbReadBase
+from gramps.gen.db import DbTxn
 from gramps.gen.merge.diff import diff_dbs
 from gramps.gen.user import User
 
diff --git a/GrampsWebSync/grampswebsync.py b/GrampsWebSync/grampswebsync.py
@@ -26,6 +26,7 @@
 import threading
 from collections.abc import Callable
 from datetime import datetime
+from typing import Any
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlparse
 
diff --git a/GrampyScript/po/template.pot b/GrampyScript/po/template.pot
@@ -0,0 +1,18 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-04-17 00:00+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/JSON/JSONImport.py b/JSON/JSONImport.py
@@ -92,7 +92,7 @@ def importData(db, filename, user):
                     elif isinstance(obj, Place):
                         db.add_place(obj, trans)
                     else:
-                        LOG.warn("ignored: " + data)
+                        LOG.warn("ignored: " + line)
                     line = fp.readline()
     except EnvironmentError as err:
         user.notify_error(_("%s could not be opened\n") % filename, str(err))
diff --git a/LifeLineChartView/lifelinechart.py b/LifeLineChartView/lifelinechart.py
@@ -1165,8 +1165,8 @@ def on_mouse_move(self, widget, event):
             self.mouse_x, self.mouse_y = event.x, event.y
             tooltip = ""
             if gr_individual:
-                if (self._tooltip_individual_cache is None or \
-                    self._tooltip_individual_cache != gr_individual, gr_family):
+                if (self._tooltip_individual_cache is None or
+                    self._tooltip_individual_cache != (gr_individual, gr_family)):
                     if self._tooltip_individual_cache != (gr_individual, gr_family):
                         self._tooltip_individual_cache = gr_individual, gr_family
                         self.queue_draw_wrapper()
diff --git a/LinesOfDescendency/lines-of-descendency.py b/LinesOfDescendency/lines-of-descendency.py
@@ -42,6 +42,7 @@
 from gramps.gen.plug.report import Report
 from gramps.gen.plug.report import CATEGORY_TEXT
 from gramps.gen.plug.report import MenuReportOptions
+from gramps.gen.errors import ReportError
 import gramps.gen.plug.report.utils as ReportUtils
 
 
diff --git a/MongoDB/mongodb.py b/MongoDB/mongodb.py
@@ -49,6 +49,7 @@
 from gramps.gen.utils.configmanager import ConfigManager
 from gramps.gen.config import config
 from gramps.gen.const import GRAMPS_LOCALE as glocale
+_ = glocale.translation.gettext
 
 LOG = logging.getLogger(".mongodb")
 _LOG = logging.getLogger(DBLOGNAME)
diff --git a/PersonEverything/PersonEverything.py b/PersonEverything/PersonEverything.py
@@ -68,6 +68,7 @@
 from gramps.gen.display.name import displayer as global_name_display
 from gramps.gen.display.place import displayer as place_displayer
 from gramps.gen.sort import Sort
+from gramps.gen.errors import ReportError
 from gramps.gen.utils.db import (get_birth_or_fallback, get_death_or_fallback)
 from gramps.gen.utils.lds import TEMPLES
 from gramps.gen.utils.place import conv_lat_lon
diff --git a/PlaceUpdate/PlaceUpdate.py b/PlaceUpdate/PlaceUpdate.py
@@ -38,6 +38,7 @@
 
 from gramps.gui.selectors import SelectorFactory
 from gramps.gui.widgets import MonitoredDate, ValidatableMaskedEntry
+from gramps.gui.editors import EditDate
 
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 try:
diff --git a/PostgreSQLEnhanced/postgresqlenhanced.py b/PostgreSQLEnhanced/postgresqlenhanced.py
@@ -40,6 +40,7 @@
 import re
 import pickle
 import sys
+import time
 from urllib.parse import urlparse, parse_qs
 
 # -------------------------------------------------------------------------
diff --git a/Query/QueryGramplet.py b/Query/QueryGramplet.py
@@ -36,6 +36,7 @@
 
 from gramps.gen.plug import Gramplet
 import gramps.gen
+import sys
 
 #------------------------------------------------------------------------
 #
diff --git a/Query/QueryQuickview.py b/Query/QueryQuickview.py
@@ -344,7 +344,7 @@ def get_rows(self):
         table = Table()
         self.sdb = SimpleAccess(self.database)
         self.process_table(table) # a class that has .row(1, 2, 3, ...)
-        print(_("{rows:d} rows processed in {secs} seconds.\n").format(rows=self.select, secs=time.time() - start_time)
+        print(_("{rows:d} rows processed in {secs} seconds.\n").format(rows=self.select, secs=time.time() - start_time))
         return table
 
     def eval(self):
diff --git a/QuiltView/QuiltView.py b/QuiltView/QuiltView.py
@@ -56,7 +56,7 @@
 # Gramps Modules
 #
 #-------------------------------------------------------------------------
-from gramps.gen.lib import Person, Family, ChildRef, Name
+from gramps.gen.lib import Person, Family, ChildRef, Name, Surname
 from gramps.gui.views.navigationview import NavigationView
 from gramps.gen.display.name import displayer as name_displayer
 from gramps.gen.errors import WindowActiveError
@@ -1236,9 +1236,9 @@ def add_children_submenu(self, menu, person, family=None):
 
             if find_children(self.dbstate.db, child):
                 label = Gtk.Label(label='<b><i>%s</i></b>'
-                                  % escape(displayer.display(child)))
+                                  % escape(name_displayer.display(child)))
             else:
-                label = Gtk.Label(label=escape(displayer.display(child)))
+                label = Gtk.Label(label=escape(name_displayer.display(child)))
 
             child_item = Gtk.MenuItem()
             label.set_use_markup(True)
diff --git a/RelID/relation_tab.py b/RelID/relation_tab.py
@@ -41,7 +41,7 @@
 from gramps.gui.plug import tool
 from gramps.gen.plug.menu import StringOption, FilterOption, PersonOption, EnumeratedListOption
 import gramps.gen.plug.report.utils as ReportUtils
-from gramps.gui.dialog import WarningDialog, OkDialog
+from gramps.gui.dialog import WarningDialog, OkDialog, ErrorDialog
 from gramps.gen.display.name import displayer as name_displayer
 from gramps.gen.relationship import get_relationship_calculator
 from gramps.gen.filters import GenericFilterFactory, rules
diff --git a/SourceIndex/birth.py b/SourceIndex/birth.py
@@ -97,8 +97,8 @@ def on_ok_clicked(widget, data=None):
         print('save')
         Gtk.main_save()
 
-    def on_witness_clicked( widget, data=None):
-        print(event)
+    def on_witness_clicked(widget, data=None):
+        print('witness')
         #from witness import Witness
         #Witness.window.show()
 
diff --git a/SourceIndex/index.py b/SourceIndex/index.py
@@ -421,7 +421,6 @@ def indexes(self):
         'Load indexes' means to load ordered tables, search environment
         """
 
-        files = f.endswith('.xml')
         parent_path = os.path.join(USER_PLUGINS, 'SourceIndex')
 
 
diff --git a/SourceReferences/SourceReferences.py b/SourceReferences/SourceReferences.py
@@ -24,6 +24,7 @@
 from Utils import navigation_label
 from gen.plug import Gramplet
 import gtk
+import gramps.gen.errors as Errors
 
 from gramps.gen.const import GRAMPS_LOCALE as glocale
 try:
diff --git a/SurnameMappingGramplet/SurnameMappingGramplet.gpr.py b/SurnameMappingGramplet/SurnameMappingGramplet.gpr.py
diff --git a/SurnameMappingGramplet/SurnameMappingGramplet.py b/SurnameMappingGramplet/SurnameMappingGramplet.py
@@ -140,15 +140,15 @@ def add_mapping_clicked(self, event):
         response = self.show_dialog(_("Create Mapping"), None, None)
         if response:
             (surname, group) = response
-            self.dbstate.db.set_name_group_mapping(unicode(surname), unicode(group))
+            self.dbstate.db.set_name_group_mapping(str(surname), str(group))
         self.main()
 
     def remove_mapping_clicked(self, event):
         (model, pathlist) = self.treeview.get_selection().get_selected_rows()
         for path in pathlist:
             tree_iter = model.get_iter(path)
             value = model.get_value(tree_iter, 0)
-            self.dbstate.db.set_name_group_mapping(unicode(value), None)
+            self.dbstate.db.set_name_group_mapping(str(value), None)
         self.main()
 
     def edit_row(self, model, path):
@@ -159,10 +159,10 @@ def edit_row(self, model, path):
         if response:
             (new_surname, new_group) = response
             if new_surname == surname:
-                self.dbstate.db.set_name_group_mapping(unicode(surname), unicode(new_group))
+                self.dbstate.db.set_name_group_mapping(str(surname), str(new_group))
             else:
-                self.dbstate.db.set_name_group_mapping(unicode(surname), None)
-                self.dbstate.db.set_name_group_mapping(unicode(new_surname), unicode(new_group))
+                self.dbstate.db.set_name_group_mapping(str(surname), None)
+                self.dbstate.db.set_name_group_mapping(str(new_surname), str(new_group))
 
     def edit_mapping_clicked(self, event):
         (model, pathlist) = self.treeview.get_selection().get_selected_rows()
diff --git a/TMGimporter/libtmg.py b/TMGimporter/libtmg.py
diff --git a/TMGimporter/tests/test_integration.py b/TMGimporter/tests/test_integration.py
diff --git a/TMGimporter/tests/test_libtmg.py b/TMGimporter/tests/test_libtmg.py
diff --git a/TimelinePedigreeView/TimelinePedigreeView.py b/TimelinePedigreeView/TimelinePedigreeView.py
diff --git a/libaccess/libaccess.py b/libaccess/libaccess.py
diff --git a/lxml/lxmlGramplet.py b/lxml/lxmlGramplet.py

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`import xml.dom.minidom`
`32`	`32`	`import getopt`
`33`	`33`	`import sys`
	`34`	`+from functools import reduce`
`34`	`35`	`#-------------------------------------------------------------------------`
`35`	`36`	`#`
`36`	`37`	`# variables`