diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml deleted file mode 100644 index c68c2d4..0000000 --- a/.github/workflows/python.yml +++ /dev/null @@ -1,103 +0,0 @@ -name: Python CI - -on: - push: - -jobs: - dependencies: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.9.5' - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/requirements-dev.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Install dependencies - run: pip3 install -r requirements.txt -r requirements-dev.txt - tests: - needs: [dependencies] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.9.5' - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/requirements-dev.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Install dependencies - run: pip3 install -r requirements.txt -r requirements-dev.txt - - name: Run Pytest - run: pytest tests - linting: - needs: [tests] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.9.5' - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/requirements-dev.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Install dependencies - run: pip3 install -r requirements.txt -r requirements-dev.txt - - name: Linting - run: pylint didier database - typing: - needs: [tests] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.9.5' - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/requirements-dev.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Install dependencies - run: pip3 install -r requirements.txt -r requirements-dev.txt - - name: Typing - run: mypy didier database - formatting: - needs: [tests] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.9.5' - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt', '**/requirements-dev.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Install dependencies - run: pip3 install -r requirements.txt -r requirements-dev.txt - - name: Formatting - run: black --check didier database diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..0c33832 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,15 @@ +name: Run Tests + +on: + push: + +jobs: + python-tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: '3.9.5' + - run: pip3 install -r requirements.txt + - run: pytest tests \ No newline at end of file diff --git a/didier/cogs/__init__.py b/didier/cogs/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/didier/cogs/test_cog.py b/didier/cogs/test_cog.py deleted file mode 100644 index 093aaf7..0000000 --- a/didier/cogs/test_cog.py +++ /dev/null @@ -1,14 +0,0 @@ -from discord.ext import commands - -from didier import Didier - - -class TestCog(commands.Cog): - client: Didier - - def __init__(self, client: Didier): - self.client = client - - -async def setup(client: Didier): - await client.add_cog(TestCog(client)) diff --git a/didier/didier.py b/didier/didier.py index f4b36c5..1329163 100644 --- a/didier/didier.py +++ b/didier/didier.py @@ -1,5 +1,3 @@ -import os - import discord from discord.ext import commands from sqlalchemy.ext.asyncio import AsyncSession @@ -12,8 +10,6 @@ from didier.utils.prefix import get_prefix class Didier(commands.Bot): """DIDIER <3""" - initial_extensions: tuple[str] = () - def __init__(self): activity = discord.Activity(type=discord.ActivityType.playing, name=settings.DISCORD_STATUS_MESSAGE) status = discord.Status.online @@ -31,31 +27,7 @@ class Didier(commands.Bot): command_prefix=get_prefix, case_insensitive=True, intents=intents, activity=activity, status=status ) - async def setup_hook(self) -> None: - """Hook called once the bot is initialised""" - await self._load_initial_cogs() - await self._load_directory_cogs("didier/cogs") - @property def db_session(self) -> AsyncSession: """Obtain a database session""" return DBSession() - - async def on_ready(self): - """Event triggered when the bot is ready""" - print(settings.DISCORD_READY_MESSAGE) - - async def _load_initial_cogs(self): - """Load all cogs""" - for extension in self.initial_extensions: - await self.load_extension(f"didier.cogs.{extension}") - - async def _load_directory_cogs(self, path: str): - """Load all cogs in a given directory""" - load_path = path.removeprefix("./").replace("/", ".") - - for file in os.listdir(path): - if file.endswith(".py") and not file.startswith("_") and not file.startswith(self.initial_extensions): - await self.load_extension(f"{load_path}.{file[:-3]}") - elif os.path.isdir(new_path := f"{path}/{file}"): - await self._load_directory_cogs(new_path) diff --git a/main.py b/main.py index 8c8168b..cb4aa8e 100644 --- a/main.py +++ b/main.py @@ -22,9 +22,9 @@ def setup_logging(): handler = RotatingFileHandler(settings.LOGFILE, mode="a", maxBytes=max_log_size, backupCount=5) handler.setFormatter(logging.Formatter("[%(asctime)s] [%(levelname)s]: %(message)s")) + handler.setLevel(logging.INFO) didier_log.addHandler(handler) - didier_log.setLevel(logging.INFO) logging.getLogger("discord").setLevel(logging.ERROR) diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_dummy.py b/tests/test_dummy.py deleted file mode 100644 index f4f5361..0000000 --- a/tests/test_dummy.py +++ /dev/null @@ -1,2 +0,0 @@ -def test_dummy(): - assert True