Merge pull request #644 from davidhozic/develop

Merge develop into master

Author: davidhozic

.github/workflows/python-publish.yml

@@ -30,7 +30,7 @@ jobs:
         python -m build
 
     - name: Publish package
-      uses: pypa/gh-action-pypi-publish@0ab0b79471669eb3a4d647e625009c62f9f3b241
+      uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}

.readthedocs.yml

@@ -12,7 +12,7 @@ build:
   apt_packages:
     - inkscape
   tools:
-    python: "3.9"
+    python: "3.12"
   jobs:
     pre_build:
       - pip install .[all] .[docs]

docs/source/changelog.rst

@@ -37,6 +37,27 @@ Glossary
 Releases
 ---------------------
 
+v4.2.0
+=====================
+- Deprecated parameters will now raise an exception:
+
+  - :class:`daf.guild.AutoGUILD` and :class:`daf.message.AutoCHANNEL`:
+
+    - ``include_pattern``: :class:`TypeError` when using :class:`str`. Logical operators are now required.
+    - ``exclude_pattern``: :class:`NameError` when used.
+
+  - :class:`daf.message.TextMESSAGE`,
+    :class:`daf.message.VoiceMESSAGE` and
+    :class:`daf.message.DirectMESSAGE`:
+
+    - ``start_period``: :class:`NameError` when used.
+    - ``end_period``: :class:`NameError` when used.
+    - ``start_in``: :class:`NameError` when used.
+    - ``data`` parameter now requires subclasses of ``BaseMessageData`` instead of plain types.
+      Additionally, the ``data_function`` can no longer be used and has been removed completely.
+
+
+
 v4.1.1
 =====================
 - Fixed segmentation-fault crash when using Python 3.12+.

requirements/docs.txt

@@ -1,8 +1,8 @@
-sphinx==7.3.7
-sphinx-autobuild==2024.9.3
+sphinx==8.2.3
+sphinx-autobuild==2024.9.19
 sphinx-copybutton==0.5.2
 furo==2024.8.6
 enum-tools[sphinx]==0.12.0
 sphinx-design[furo]==0.6.1
 readthedocs-sphinx-search==0.3.2
-sphinxcontrib-svg2pdfconverter==1.2.2
+sphinxcontrib-svg2pdfconverter==1.3.0

requirements/mandatory.txt

@@ -1,10 +1,10 @@
-aiohttp>=3.9.0,<3.11.0
-aiohttp_socks>=0.8,<0.10
+aiohttp>=3.9.0,<3.12.0
+aiohttp_socks>=0.8,<0.11
 typeguard>=2.13,<2.14
 typing_extensions>=4,<5; python_version < "3.11"
-tkinter-async-execute>=1.2,<1.4
+tkinter-async-execute>=1.2,<1.5
 asyncio-event-hub>=1.0,<1.2
 tkclasswiz>=1.4,<1.5
 ttkbootstrap==1.10.1
-pillow>=10.4.0,<10.5.0
-audioop-lts~=0.2.0; python_version>='3.13'
+audioop-lts~=0.2.1; python_version>='3.13'
+pillow>=10.4.0,<11.2.0

requirements/sql.txt

@@ -1,5 +1,5 @@
 sqlalchemy[asyncio]>=2.0,<3.0
-aiosqlite>=0.19,<0.21
+aiosqlite>=0.19,<0.22
 pymssql>=2.2,<2.4
 asyncpg>=0.29,<0.31
 asyncmy>=0.2,<0.3

requirements/web.txt

@@ -1,3 +1,4 @@
-selenium>=4.16,<4.25
+selenium>=4.16,<4.30
 undetected-chromedriver>=3.5,<3.6
 webdriver-manager>=4.0,<4.1
+setuptools>=77.0,<77.1; python_version>='3.12'

src/daf/__init__.py

@@ -18,5 +18,4 @@
 from .responder import *
 from .messagedata import *
 
-
-VERSION = "4.1.2"
+VERSION = "4.2.0"

src/daf/dtypes.py

@@ -2,40 +2,16 @@
     The module contains definitions regarding the data types
     you can send using the xxxMESSAGE objects.
 """
-from typing import Any, Callable, Coroutine, Union, Optional
-from functools import wraps
+from typing import Callable
 
 from .logging.tracing import *
-from .misc import doc
-
-import importlib.util as iu
-import io
 
 
 __all__ = (
     "data_function",
-    "_FunctionBaseCLASS",
 )
 
 
-class GLOBALS:
-    "Storage class used for storing global variables"
-    
-
-
-#######################################################################
-# Decorators
-#######################################################################
-class _FunctionBaseCLASS:
-    """
-    Used as a base class to FunctionCLASS which gets created in :ref:`data_function` decorator.
-    Because the FunctionCLASS is inaccessible outside the :ref:`data_function` decorator,
-    this class is used to detect if the MESSAGE.data parameter is of function type,
-    because the function isinstance also returns True when comparing
-    the object to it's class or to the base class from which the object class is inherited from.
-    """
-
-
 def data_function(fnc: Callable):
     """
     Decorator used for wrapping a function that will return data to send when the message is ready.
@@ -73,50 +49,7 @@ def get_data():
         a ``data`` parameter to the :ref:`Messages` objects.
     """
     trace(
-        "Using @data_function is deprecated. Use DynamicMessageData / DynamicMessageData instead.",
-        TraceLEVELS.DEPRECATED
+        "Using @data_function is deprecated and its usage is no longer allowed. Use DynamicMessageData / DynamicMessageData instead.",
+        TraceLEVELS.ERROR,
+        exception_cls=NameError
     )
-
-    @wraps(fnc, updated=[])
-    class FunctionCLASS(_FunctionBaseCLASS):
-        """
-        Used for creating special classes that are then used to create objects in the daf.MESSAGE
-        data parameter, allows for sending dynamic content received thru an user defined function.
-
-        Parameters
-        -----------
-        - Custom number of positional and keyword arguments.
-
-        .. literalinclude:: ../../Examples/Message Types/TextMESSAGE/main_data_function.py
-            :language: python
-        """
-        __slots__ = (
-            "args",
-            "kwargs",
-            "func_name",
-        )
-
-        def __init__(self, *args: Any, **kwargs: Any):
-            self.fnc = fnc
-            self.args = args
-            self.kwargs = kwargs
-            self.func_name = fnc.__name__
-
-        async def retrieve(self):
-            """
-            Retrieves the data from the user function.
-            """
-            _ = fnc(*self.args, **self.kwargs)
-            if isinstance(_, Coroutine):
-                return await _
-            return _
-
-        def __str__(self) -> str:
-            return self.func_name
-
-    return FunctionCLASS
-
-
-#######################################################################
-# Other
-#######################################################################

src/daf/guild/autoguild.py

@@ -140,20 +140,24 @@ def __init__(
             invite_track = []
 
         if isinstance(include_pattern, str):
+            include_pattern = regex(re.sub(r"\s*\|\s*", '', include_pattern))
             trace(
-                "Using text (str) on 'include_pattern' parameter of AutoGUILD is deprecated (planned for removal in 4.2.0)!\n"
-                "Use logical operators instead (daf.logic). E. g., regex, contains, or_, ...\n",
-                TraceLEVELS.DEPRECATED
+                "Using text (str) on 'include_pattern' parameter of AutoGUILD is deprecated and has been removed!\n"
+                "Use logical operators instead (daf.logic). E. g., regex, contains, or_, ...\n"
+                f"E. g., use {include_pattern.__class__} as the include_pattern parameter.",
+                TraceLEVELS.ERROR,
+                exception_cls=TypeError
             )
-            include_pattern = regex(re.sub(r"\s*\|\s*", '', include_pattern))
 
         if exclude_pattern is not None:
-            trace(
-                "'exclude_pattern' parameter is deprecated (planned for removal in 4.2.0)!\n",
-                TraceLEVELS.DEPRECATED
-            )
             exclude_pattern = regex(re.sub(r"\s*\|\s*", '', exclude_pattern))
             include_pattern = and_(include_pattern, not_(exclude_pattern))
+            trace(
+                "'exclude_pattern' parameter is deprecated and has been removed!\n"
+                f"Use {include_pattern.__class__} instead at the include_pattern parameter.",
+                TraceLEVELS.ERROR,
+                exception_cls=NameError
+            )
 
         self.include_pattern = include_pattern
         self._remove_after = remove_after
@@ -163,7 +167,8 @@ def __init__(
         if auto_join is not None:  # TODO: remove in future after feature is reenabled.
             auto_join = None
             trace(
-                "Automatic join feature is currently disabled and will not work. It will be reenabled in a future version.",
+                "Automatic join feature is currently disabled and will not work. It will be reenabled in a future version\n"
+                "when a suitable new server provider is found",
                 TraceLEVELS.WARNING
             )
 
@@ -443,9 +448,7 @@ async def _on_update(self, _, init_options, **kwargs):
             if "invite_track" not in kwargs:
                 kwargs["invite_track"] = list(self._invite_join_count.keys())
 
-            if "exclude_pattern" not in kwargs: # DEPRECATED; TODO: remove in 4.2.0
-                kwargs["exclude_pattern"] = None
-
+            kwargs["exclude_pattern"] = None
             kwargs["messages"] = kwargs.pop("messages", self._messages)
             if init_options is None:
                 init_options = {"parent": self.parent, "event_ctrl": self._event_ctrl}