Compare commits

...

19 Commits

Author SHA1 Message Date
f0ffdf096d Merge pull request 'Pycord support initial release' (#48) from dev into main
All checks were successful
Tests / test (3.10) (push) Successful in 1m8s
Tests / test (3.11) (push) Successful in 1m5s
Tests / test (3.8) (push) Successful in 1m43s
Tests / test (3.9) (push) Successful in 1m3s
Reviewed-on: #48
2023-12-27 15:00:41 +02:00
e7555d3de1 Bump version to 2.1.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m8s
Tests / test (3.11) (pull_request) Successful in 1m3s
Tests / test (3.8) (pull_request) Successful in 1m4s
Tests / test (3.9) (pull_request) Successful in 1m8s
2023-12-27 13:46:10 +01:00
17f15aca5b Initial Pycord addition 2023-12-27 13:45:40 +01:00
73c3a1ff13 Update dependency black to v23.12.1
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m10s
Tests / test (3.11) (pull_request) Successful in 1m6s
Tests / test (3.8) (pull_request) Successful in 1m8s
Tests / test (3.9) (pull_request) Successful in 1m10s
2023-12-23 01:39:45 +02:00
bfa3d4f6e9 Update dependency mypy to v1.8.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m11s
Tests / test (3.11) (pull_request) Successful in 1m6s
Tests / test (3.8) (pull_request) Successful in 1m5s
Tests / test (3.9) (pull_request) Successful in 1m42s
2023-12-21 19:03:19 +02:00
3d10cbcb2f Update dependency isort to v5.13.2
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m15s
Tests / test (3.11) (pull_request) Successful in 1m11s
Tests / test (3.8) (pull_request) Successful in 1m5s
Tests / test (3.9) (pull_request) Successful in 1m7s
2023-12-13 23:11:44 +02:00
88f77e8494 Update dependency black to v23.12.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m5s
Tests / test (3.11) (pull_request) Successful in 1m4s
Tests / test (3.8) (pull_request) Successful in 1m1s
Tests / test (3.9) (pull_request) Successful in 1m3s
2023-12-12 08:44:33 +02:00
f5f62f20cc Update dependency types-ujson to v5.9.0.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m5s
Tests / test (3.11) (pull_request) Successful in 1m4s
Tests / test (3.8) (pull_request) Successful in 1m1s
Tests / test (3.9) (pull_request) Successful in 1m4s
2023-12-12 04:27:38 +02:00
45743bdb7e Update dependency pylint to v3.0.3
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m6s
Tests / test (3.11) (pull_request) Successful in 1m9s
Tests / test (3.8) (pull_request) Successful in 1m2s
Tests / test (3.9) (pull_request) Successful in 1m2s
2023-12-11 23:04:59 +02:00
8e1f746309 Update dependency isort to v5.13.1
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m9s
Tests / test (3.11) (pull_request) Successful in 1m6s
Tests / test (3.8) (pull_request) Successful in 1m7s
Tests / test (3.9) (pull_request) Successful in 1m3s
2023-12-11 22:00:00 +02:00
c4df7c6106 Update dependency ujson to ~=5.9.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m11s
Tests / test (3.11) (pull_request) Successful in 1m9s
Tests / test (3.8) (pull_request) Successful in 1m10s
Tests / test (3.9) (pull_request) Successful in 1m10s
2023-12-11 01:36:51 +02:00
5103333920 Renovate's main branch is now "dev"
All checks were successful
Tests / test (3.10) (push) Successful in 1m9s
Tests / test (3.11) (push) Successful in 1m8s
Tests / test (3.8) (push) Successful in 1m6s
Tests / test (3.9) (push) Successful in 1m7s
2023-12-10 11:58:21 +01:00
df09a21aee Update dependency isort to v5.13.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m14s
Tests / test (3.11) (pull_request) Successful in 1m9s
Tests / test (3.8) (pull_request) Successful in 1m8s
Tests / test (3.9) (pull_request) Successful in 1m7s
Tests / test (3.10) (push) Successful in 1m11s
Tests / test (3.11) (push) Successful in 1m10s
Tests / test (3.8) (push) Successful in 1m5s
Tests / test (3.9) (push) Successful in 1m8s
2023-12-09 16:05:30 +02:00
1800ff4dc3 Update dependency pytest-asyncio to v0.23.2
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m6s
Tests / test (3.11) (pull_request) Successful in 1m4s
Tests / test (3.8) (pull_request) Successful in 1m7s
Tests / test (3.9) (pull_request) Successful in 1m1s
Tests / test (3.10) (push) Successful in 1m4s
Tests / test (3.11) (push) Successful in 1m6s
Tests / test (3.8) (push) Successful in 1m0s
Tests / test (3.9) (push) Successful in 1m1s
2023-12-04 10:14:13 +02:00
9557b1759b Update dependency pytest-asyncio to v0.23.1
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m6s
Tests / test (3.11) (pull_request) Successful in 1m16s
Tests / test (3.8) (pull_request) Successful in 1m1s
Tests / test (3.9) (pull_request) Successful in 1m51s
Tests / test (3.10) (push) Successful in 1m4s
Tests / test (3.11) (push) Successful in 1m6s
Tests / test (3.8) (push) Successful in 1m1s
Tests / test (3.9) (push) Successful in 1m2s
2023-12-03 21:28:30 +02:00
a650039bc9 Update dependency tox to v4.11.4
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m5s
Tests / test (3.11) (pull_request) Successful in 1m4s
Tests / test (3.8) (pull_request) Successful in 1m1s
Tests / test (3.9) (pull_request) Successful in 1m3s
Tests / test (3.10) (push) Successful in 1m6s
Tests / test (3.11) (push) Successful in 1m5s
Tests / test (3.8) (push) Successful in 1m3s
Tests / test (3.9) (push) Successful in 1m2s
2023-11-28 07:18:04 +02:00
a6a1f1cacc Update dependency mypy to v1.7.1
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m8s
Tests / test (3.11) (pull_request) Successful in 1m13s
Tests / test (3.8) (pull_request) Successful in 1m46s
Tests / test (3.9) (pull_request) Successful in 1m49s
Tests / test (3.10) (push) Successful in 3m17s
Tests / test (3.11) (push) Successful in 1m9s
Tests / test (3.8) (push) Successful in 3m4s
Tests / test (3.9) (push) Successful in 1m34s
2023-11-23 20:34:48 +02:00
c8d5a81a2c Update dependency mypy to v1.7.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m7s
Tests / test (3.11) (pull_request) Successful in 1m5s
Tests / test (3.8) (pull_request) Successful in 1m2s
Tests / test (3.9) (pull_request) Successful in 1m12s
Tests / test (3.10) (push) Successful in 1m29s
Tests / test (3.11) (push) Successful in 1m9s
Tests / test (3.8) (push) Successful in 1m18s
Tests / test (3.9) (push) Successful in 1m19s
2023-11-10 17:25:50 +02:00
c23326cd10 Update dependency black to v23.11.0
All checks were successful
Tests / test (3.10) (pull_request) Successful in 1m9s
Tests / test (3.11) (pull_request) Successful in 1m4s
Tests / test (3.8) (pull_request) Successful in 1m1s
Tests / test (3.9) (pull_request) Successful in 1m1s
Tests / test (3.10) (push) Successful in 1m3s
Tests / test (3.11) (push) Successful in 1m6s
Tests / test (3.8) (push) Successful in 1m0s
Tests / test (3.9) (push) Successful in 1m5s
2023-11-08 08:31:01 +02:00
8 changed files with 73 additions and 11 deletions

View File

@@ -3,6 +3,9 @@
"extends": [
"config:base"
],
"baseBranches": [
"dev"
],
"pip_requirements": {
"fileMatch": [
"requirements/.*\\.txt$"

View File

@@ -1,11 +1,11 @@
black==23.10.1
black==23.12.1
build==1.0.3
isort==5.12.0
mypy==1.6.1
pylint==3.0.2
pytest-asyncio==0.22.0
isort==5.13.2
mypy==1.8.0
pylint==3.0.3
pytest-asyncio==0.23.2
pytest-cov==4.1.0
pytest==7.4.3
tox==4.11.3
tox==4.11.4
types-aiofiles==23.2.0.0
types-ujson==5.8.0.1
types-ujson==5.9.0.0

View File

@@ -1 +1,2 @@
apscheduler~=3.10.4
py-cord~=2.4.1

View File

@@ -1,2 +1,2 @@
apscheduler~=3.10.1
apscheduler~=3.10.4
pyrogram~=2.0.106

View File

@@ -1 +1 @@
ujson~=5.8.0
ujson~=5.9.0

View File

@@ -1,6 +1,6 @@
__version__ = "2.0.1"
__version__ = "2.1.0"
__license__ = "GPL3"
__author__ = "Profitroll"
from . import i18n, pyrogram, sync
from . import i18n, pycord, pyrogram, sync
from .__main__ import *

View File

@@ -0,0 +1 @@
from .bot import PycordBot

View File

@@ -0,0 +1,57 @@
import logging
from pathlib import Path
from typing import Any, Dict, Union
try:
from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.schedulers.background import BackgroundScheduler
from discord import Bot
except ImportError as exc:
raise ImportError(
"You need to install libbot[pycord] in order to use this class."
) from exc
try:
from ujson import loads
except ImportError:
from json import loads
from libbot.i18n import BotLocale
from libbot.i18n.sync import _
logger = logging.getLogger(__name__)
class PycordBot(Bot):
def __init__(
self,
config: Union[Dict[str, Any], None] = None,
config_path: Union[str, Path] = Path("config.json"),
locales_root: Union[str, Path, None] = None,
scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = None,
**kwargs,
):
if config is None:
with open(config_path, "r", encoding="utf-8") as f:
self.config: dict = loads(f.read())
else:
self.config = config
super().__init__(
debug_guilds=self.config["bot"]["debug_guilds"],
owner_ids=self.config["bot"]["owners"],
**kwargs,
)
self.bot_locale: BotLocale = BotLocale(
default_locale=self.config["locale"],
locales_root=(Path("locale") if locales_root is None else locales_root),
)
self.default_locale: str = self.bot_locale.default
self.locales: dict = self.bot_locale.locales
self._ = self.bot_locale._
self.in_all_locales = self.bot_locale.in_all_locales
self.in_every_locale = self.bot_locale.in_every_locale
self.scheduler: Union[AsyncIOScheduler, BackgroundScheduler, None] = scheduler