Merge branch 'main_g'

# Conflicts:
#	loglan_core/addons/__init__.py

.github/workflows/pylint.yml

@@ -18,7 +18,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-tests.txt
+        pip install -r requirements.txt
+        pip install pylint
     - name: Check with Pylint
       run: |
         pylint --fail-under=9.5 loglan_core

.github/workflows/pytest.yml

@@ -22,7 +22,6 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements-tests.txt
-          pip install coverage
       - name: Test with pytest
         run: |
           pytest --cov loglan_core

docs/event.html

@@ -35,7 +35,7 @@ <h2 class="section-title" id="header-classes">Classes</h2>
 <dl>
 <dt id="loglan_core.event.BaseEvent"><code class="flex name class">
 <span>class <span class="ident">BaseEvent</span></span>
-<span>(</span><span>date, name, definition, annotation, suffix)</span>
+<span>(</span><span>name, date, definition, annotation, suffix)</span>
 </code></dt>
 <dd>
 <div class="desc"><p>Base Event's DB Model</p>

loglan_core/__init__.py

@@ -3,7 +3,7 @@
 """
 
 __author__ = "torrua"
-__copyright__ = "Copyright 2023, loglan_core project"
+__copyright__ = "Copyright 2024, loglan_core project"
 __email__ = "torrua@gmail.com"
 
 from loglan_core.author import BaseAuthor as Author
@@ -21,3 +21,5 @@
 from loglan_core.word import BaseWord as Word
 from loglan_core.word_source import BaseWordSource as WordSource
 from loglan_core.word_spell import BaseWordSpell as WordSpell
+from loglan_core.base import BaseModel as Base
+from loglan_core.addons.word_selector import WordSelector

loglan_core/event.py

@@ -42,15 +42,15 @@ class BaseEvent(BaseModel):
 
     def __init__(
         self,
-        date: Mapped[datetime.date],
         name: Mapped[str_064],
+        date: Mapped[datetime.date],
         definition: Mapped[str],
         annotation: Mapped[str_016],
         suffix: Mapped[str_016],
     ):
         super().__init__()
-        self.date = date
         self.name = name
+        self.date = date
         self.definition = definition
         self.annotation = annotation
         self.suffix = suffix
@@ -62,12 +62,12 @@ def __str__(self):
             f"{self.name} ({self.date})>"
         )
 
-    date: Mapped[datetime.date] = mapped_column(nullable=False)
-    """*Event's starting day*  
-        **dateime.date** : nullable=False, unique=False"""
     name: Mapped[str_064] = mapped_column(nullable=False)
     """*Event's short name*  
         **str** : max_length=64, nullable=False, unique=False"""
+    date: Mapped[datetime.date] = mapped_column(nullable=False)
+    """*Event's starting day*  
+        **dateime.date** : nullable=False, unique=False"""
     definition: Mapped[str] = mapped_column(Text, nullable=False)
     """*Event's definition*
         **str** : nullable=False, unique=False"""

requirements-dev.txt

@@ -4,4 +4,5 @@ black~=23.12.1
 mypy~=1.8.0
 radon~=6.0.1
 setuptools~=69.0.3
-wheel~=0.42.0
+wheel~=0.42.0
+pylint~=3.0

requirements-tests.txt

@@ -1,7 +1,6 @@
 -r requirements.txt
 
-coverage~=7.3
-pylint~=3.0
+coverage~=7.4
 pytest-cov~=4.1
 pytest~=7.4
 scrutinizer-ocular~=1.0