Universal 3.8 support

davidhozic · davidhozic · commit 9023afa29630 · 2023-04-15T11:25:01.000+02:00
diff --git a/.flake8 b/.flake8
@@ -1,5 +1,5 @@
 [flake8]
-min_python_version = 3.10
+min_python_version = 3.8
 
 exclude = src/_discord
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -22,7 +22,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
-          python-version: '3.10' 
+          python-version: '3.8' 
     - name: Install requirements
       run: |
         sh ./setup_build_env_do_not_run/install.sh
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -14,7 +14,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.8", "3.11"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -35,13 +35,13 @@ jobs:
     - name: Test version compatibility
       env:
         DISCORD_TOKEN: ${{secrets.DATT}}
-      if: ${{ matrix.python-version != 3.10 }}
+      if: ${{ matrix.python-version != 3.8 }}
       run: |
         pytest -v testing/test_period_dynamic.py  
     - name: Test all
       env:
         DISCORD_TOKEN: ${{secrets.DATT}}
-      if: ${{ matrix.python-version == 3.10 }}
+      if: ${{ matrix.python-version == 3.8 }}
       run: |
         pytest -v
       
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,5 @@ docs/common/reference
 daf_web_data
 test.py
 
-venv/*
+venv/*
+.venv/*
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -12,7 +12,7 @@ build:
   apt_packages:
     - inkscape
   tools:
-    python: "3.10"
+    python: "3.8"
   jobs:
     pre_build:
       - pip install .[all] .[docs]
diff --git a/README.rst b/README.rst
@@ -32,7 +32,7 @@ Installation
 ----------------------
 DAF can be installed though command prompt/terminal using the bottom commands.
 
-Pre-requirement: `Python (minimum v3.10) <https://www.python.org/downloads/>`_.
+Pre-requirement: `Python (minimum v3.8) <https://www.python.org/downloads/>`_.
 
 **Main package**
 
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -56,7 +56,7 @@ DAF can be installed though command prompt/terminal using the bottom commands.
 
     .. tab-item:: Main package
         
-        Pre-requirement: `Python (minimum v3.10) <https://www.python.org/downloads/>`_
+        Pre-requirement: `Python (minimum v3.8) <https://www.python.org/downloads/>`_
 
         .. code-block:: bash
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -13,7 +13,7 @@ authors = [
 ]
 description = "Framework for periodic advertisements on Discord"
 readme = "README.rst"
-requires-python = ">=3.10"
+requires-python = ">=3.8"
 keywords = ["Discord", "Advertising", "Framework", "NFT", "Shilling"]
 classifiers = [
     "Programming Language :: Python :: 3",
diff --git a/src/daf/client.py b/src/daf/client.py
@@ -1,7 +1,7 @@
 """
     This modules contains definitions related to the client (for API)
 """
-from typing import Optional, Union, List
+from typing import Optional, Union, List, Dict
 
 from . import misc
 from . import guild
@@ -276,7 +276,7 @@ async def initialize(self):
         self.tasks.append(asyncio.create_task(self._loop()))
         self._running = True
 
-    def generate_log_context(self) -> dict[str, Union[str, int]]:
+    def generate_log_context(self) -> Dict[str, Union[str, int]]:
         """
         Generates a dictionary of the user's context,
         which is then used for logging.
diff --git a/src/daf/guild.py b/src/daf/guild.py
@@ -870,7 +870,7 @@ async def _join_guilds(self):
 
         try:
             # Get next result from top.gg
-            yielded: web.QueryResult = await anext(self.guild_query_iter)
+            yielded: web.QueryResult = await self.guild_query_iter.__anext__()
             if (
                 re.search(self.include_pattern, yielded.name) is None or
                 (
diff --git a/src/daf/logging/_logging.py b/src/daf/logging/_logging.py
@@ -2,8 +2,8 @@
 This module is responsible for the logging in daf.
 It contains all the logging classes.
 """
-from datetime import datetime
-from typing import Optional, Literal
+from datetime import datetime, date
+from typing import Optional, Literal, Union, Tuple, List
 
 from .tracing import trace, TraceLEVELS
 from .. import misc
@@ -23,7 +23,7 @@
 
 # Constants
 # ---------------------#
-C_FILE_NAME_FORBIDDEN_CHAR = ('<','>','"','/','\\','|','?','*',":")
+C_FILE_NAME_FORBIDDEN_CHAR = ('<', '>', '"', '/', '\\', '|', '?', '*', ":")
 
 
 class GLOBAL:
@@ -75,28 +75,28 @@ async def _save_log(self, guild_context: dict, message_context: dict, author_con
 
     async def analytic_get_num_messages(
             self,
-            guild: int | None = None,
-            author: int | None = None,
-            after: datetime | None = None,
-            before: datetime | None = None,
-            guild_type: Literal["USER", "GUILD"] | None = None,
-            message_type: Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"] | None = None,
+            guild: Union[int, None] = None,
+            author: Union[int, None] = None,
+            after: Union[datetime, None] = None,
+            before: Union[datetime, None] = None,
+            guild_type: Union[Literal["USER", "GUILD"], None] = None,
+            message_type: Union[Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"], None] = None,
             sort_by: Literal["successful", "failed", "guild_snow", "guild_name", "author_snow", "author_name"] = "successful",
             sort_by_direction: Literal["asc", "desc"] = "desc",
             limit: int = 500,
             group_by: Literal["year", "month", "day"] = "day"
-    ) -> tuple[int]:
+    ) -> List[Tuple[date, int, int, int, str, int, str]]:
         raise NotImplementedError
 
     async def analytic_get_message_log(
             self,
-            guild: int | None = None,
-            author: int | None = None,
-            after: datetime | None = None,
-            before: datetime | None = None,
-            success_rate: tuple[float, float] = (0, 100),
-            guild_type: Literal["USER", "GUILD"] | None = None,
-            message_type: Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"] | None = None,
+            guild: Union[int, None] = None,
+            author: Union[int, None] = None,
+            after: Union[datetime, None] = None,
+            before: Union[datetime, None] = None,
+            success_rate: Tuple[float, float] = (0, 100),
+            guild_type: Union[Literal["USER", "GUILD"], None] = None,
+            message_type: Union[Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"], None] = None,
             sort_by: Literal["timestamp", "success_rate"] = "timestamp",
             sort_by_direction: Literal["asc", "desc"] = "desc",
             limit: int = 500,
diff --git a/src/daf/logging/sql.py b/src/daf/logging/sql.py
@@ -8,7 +8,7 @@
         Made SQL an optional functionality
 """
 from datetime import datetime, date
-from typing import Callable, Dict, List, Literal, Any, Union, Optional
+from typing import Callable, Dict, List, Literal, Any, Union, Optional, Tuple
 from contextlib import suppress
 from typeguard import typechecked
 
@@ -130,7 +130,6 @@ def __hash__(self):
             return super().__hash__()
 
 
-
 class TableCache:
     """
     Used for caching table values to IDs for faster access.
@@ -818,17 +817,17 @@ async def _get_guild(self, id_: int, session: AsyncSession | Session):
 
     async def analytic_get_num_messages(
             self,
-            guild: int | None = None,
-            author: int | None = None,
-            after: datetime | None = None,
-            before: datetime | None = None,
-            guild_type: Literal["USER", "GUILD"] | None = None,
-            message_type: Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"] | None = None,
+            guild: Union[int, None] = None,
+            author: Union[int, None] = None,
+            after: Union[datetime, None] = None,
+            before: Union[datetime, None] = None,
+            guild_type: Union[Literal["USER", "GUILD"], None] = None,
+            message_type: Union[Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"], None] = None,
             sort_by: Literal["successful", "failed", "guild_snow", "guild_name", "author_snow", "author_name"] = "successful",
             sort_by_direction: Literal["asc", "desc"] = "desc",
             limit: int = 500,
             group_by: Literal["year", "month", "day"] = "day"
-    ) -> list[tuple[date, int, int, int, str, int, str]]:
+    ) -> List[Tuple[date, int, int, int, str, int, str]]:
         """
 
         Parameters
@@ -837,9 +836,9 @@ async def analytic_get_num_messages(
             The snowflake id of the guild.
         author: int
             The snowflake id of the author.
-        after: datetime | None = None
+        after: Union[datetime, None] = None
             Only count messages sent after the datetime.
-        before: datetime | None
+        before: Union[datetime, None]
             Only count messages sent before the datetime.
         guild_type: Literal["USER", "GUILD"] | None,
             Type of guild.
@@ -942,29 +941,29 @@ async def analytic_get_num_messages(
 
     async def analytic_get_message_log(
             self,
-            guild: int | None = None,
-            author: int | None = None,
-            after: datetime | None = None,
-            before: datetime | None = None,
-            success_rate: tuple[float, float] = (0, 100),
-            guild_type: Literal["USER", "GUILD"] | None = None,
-            message_type: Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"] | None = None,
+            guild: Union[int, None] = None,
+            author: Union[int, None] = None,
+            after: Union[datetime, None] = None,
+            before: Union[datetime, None] = None,
+            success_rate: Tuple[float, float] = (0, 100),
+            guild_type: Union[Literal["USER", "GUILD"], None] = None,
+            message_type: Union[Literal["TextMESSAGE", "VoiceMESSAGE", "DirectMESSAGE"], None] = None,
             sort_by: Literal["timestamp", "success_rate"] = "timestamp",
             sort_by_direction: Literal["asc", "desc"] = "desc",
             limit: int = 500,
-    ) -> list["MessageLOG"]:
+    ) -> List["MessageLOG"]:
         """
         Returns a list MessageLOG objects (message logs) that match the parameters.
 
         Parameters
         --------------
-        guild: int | None
+        guild: Union[int, None]
             The snowflake id of the guild.
-        author: int | None
+        author: Union[int, None]
             The snowflake id of the author.
-        after: datetime | None
+        after: Union[datetime, None]
             Include only messages sent after this datetime.
-        before: datetime | None
+        before: Union[datetime, None]
             Include only messages sent before this datetime.
         success_rate: tuple[int, int]
             Success rate tuple containing minimum success rate and maximum success
diff --git a/src/daf/web.py b/src/daf/web.py
@@ -4,7 +4,6 @@
 and definitions responsible for making HTTP requests to find servers
 the user might want to shill into.
 """
-from __future__ import annotations
 from typing import Dict, Tuple, Callable, List, Optional, Any
 from contextlib import suppress
 from enum import auto, Enum

-Original file line number
+Diff line change
 daf_web_data
 test.py
 -venv/*
 +venv/*
 +.venv/*
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ authors = [`
`13`	`13`	`]`
`14`	`14`	`description = "Framework for periodic advertisements on Discord"`
`15`	`15`	`readme = "README.rst"`
`16`		`-requires-python = ">=3.10"`
	`16`	`+requires-python = ">=3.8"`
`17`	`17`	`keywords = ["Discord", "Advertising", "Framework", "NFT", "Shilling"]`
`18`	`18`	`classifiers = [`
`19`	`19`	`"Programming Language :: Python :: 3",`
Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ async def _join_guilds(self):`
`870`	`870`
`871`	`871`	`try:`
`872`	`872`	`# Get next result from top.gg`
`873`		`- yielded: web.QueryResult = await anext(self.guild_query_iter)`
	`873`	`+ yielded: web.QueryResult = await self.guild_query_iter.__anext__()`
`874`	`874`	`if (`
`875`	`875`	`re.search(self.include_pattern, yielded.name) is None or`
`876`	`876`	`(`