jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies for 3.11

Browse source
This commit is contained in:
Zeva Rose 2022-12-28 11:54:49 -07:00
parent 93a3cfb047
commit dfc43c1420
4 changed files with 1854 additions and 1597 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -148,3 +148,5 @@ config.yaml
# Custom NAFF versions # Custom NAFF versions
naff/ naff/
.python-version

13
jarvis/__init__.py
View file

@ -3,12 +3,11 @@ import logging
from functools import partial from functools import partial
from typing import Any from typing import Any
import aioredis
import jurigged import jurigged
import rook
from jarvis_core.db import connect from jarvis_core.db import connect
from jarvis_core.log import get_logger from jarvis_core.log import get_logger
from naff import Intents from naff import Intents
from redis import asyncio as aioredis
from jarvis import const from jarvis import const
from jarvis.client import Jarvis from jarvis.client import Jarvis
@ -62,15 +61,11 @@ async def run() -> None:
logger = get_logger("jarvis", show_locals=False) # jconfig.log_level == "DEBUG") logger = get_logger("jarvis", show_locals=False) # jconfig.log_level == "DEBUG")
logger.setLevel(jconfig.log_level) logger.setLevel(jconfig.log_level)
file_handler = logging.FileHandler(filename="jarvis.log", encoding="UTF-8", mode="w") file_handler = logging.FileHandler(filename="jarvis.log", encoding="UTF-8", mode="w")
file_handler.setFormatter( file_handler.setFormatter(logging.Formatter("[%(asctime)s] [%(name)s] [%(levelname)8s] %(message)s"))
logging.Formatter("[%(asctime)s] [%(name)s] [%(levelname)8s] %(message)s")
)
logger.addHandler(file_handler) logger.addHandler(file_handler)
# Configure client # Configure client
intents = ( intents = Intents.DEFAULT | Intents.MESSAGES | Intents.GUILD_MEMBERS | Intents.GUILD_MESSAGE_CONTENT
Intents.DEFAULT | Intents.MESSAGES | Intents.GUILD_MEMBERS | Intents.GUILD_MESSAGE_CONTENT
)
redis_config = jconfig.redis.copy() redis_config = jconfig.redis.copy()
redis_host = redis_config.pop("host") redis_host = redis_config.pop("host")
@ -89,8 +84,6 @@ async def run() -> None:
if jconfig.log_level == "DEBUG": if jconfig.log_level == "DEBUG":
logging.addLevelName(11, "\033[35mJURIG\033[0m ") logging.addLevelName(11, "\033[35mJURIG\033[0m ")
jurigged.watch(pattern="jarvis/*.py", logger=partial(jlogger, logger)) jurigged.watch(pattern="jarvis/*.py", logger=partial(jlogger, logger))
if jconfig.rook_token:
rook.start(token=jconfig.rook_token, labels={"env": "dev"})
# Initialize bot # Initialize bot
logger.info("Starting JARVIS") logger.info("Starting JARVIS")

3419
poetry.lock generated
View file

File diff suppressed because it is too large Load diff

17
pyproject.toml
View file

@ -5,10 +5,9 @@ description = "JARVIS admin bot"
authors = ["Zevaryx <zevaryx@gmail.com>"] authors = ["Zevaryx <zevaryx@gmail.com>"]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.10" python = ">=3.10,<4"
PyYAML = "^6.0" PyYAML = "^6.0"
GitPython = "^3.1.26" GitPython = "^3.1.26"
mongoengine = "^0.23.1"
opencv-python = "^4.5.5" opencv-python = "^4.5.5"
Pillow = "^9.0.0" Pillow = "^9.0.0"
psutil = "^5.9.0" psutil = "^5.9.0"
@ -16,15 +15,13 @@ python-gitlab = "^3.1.1"
ulid-py = "^1.1.0" ulid-py = "^1.1.0"
tweepy = "^4.5.0" tweepy = "^4.5.0"
jarvis-core = {git = "https://git.zevaryx.com/stark-industries/jarvis/jarvis-core.git", rev = "main"} jarvis-core = {git = "https://git.zevaryx.com/stark-industries/jarvis/jarvis-core.git", rev = "main"}
aiohttp = "^3.8.1" aiohttp = "^3.8.3"
pastypy = "^1.0.1" pastypy = "^1.0.3.post1"
dateparser = "^1.1.1" dateparser = "^1.1.1"
aiofile = "^3.7.4" aiofile = "^3.8.1"
asyncpraw = "^7.5.0" asyncpraw = "^7.5.0"
rook = "^0.1.170"
rich = "^12.3.0" rich = "^12.3.0"
jurigged = "^0.5.0" jurigged = "^0.5.3"
aioredis = "^2.0.1"
naff = { version = "^2.0.0", extras = ["orjson"] } naff = { version = "^2.0.0", extras = ["orjson"] }
ansitoimg = "^2022.1" ansitoimg = "^2022.1"
nest-asyncio = "^1.5.5" nest-asyncio = "^1.5.5"
@ -32,10 +29,14 @@ thefuzz = {extras = ["speedup"], version = "^0.19.0"}
beautifulsoup4 = "^4.11.1" beautifulsoup4 = "^4.11.1"
calculator = {git = "https://git.zevaryx.com/zevaryx/calculator.git"} calculator = {git = "https://git.zevaryx.com/zevaryx/calculator.git"}
nafftrack = {git = "https://github.com/zevaryx/nafftrack.git"} nafftrack = {git = "https://github.com/zevaryx/nafftrack.git"}
redis = "^4.4.0"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
black = {version = "^22.3.0", allow-prereleases = true} black = {version = "^22.3.0", allow-prereleases = true}
[tool.poetry.group.dev.dependencies]
pre-commit = "^2.21.0"
[build-system] [build-system]
requires = ["poetry-core>=1.0.0"] requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api" build-backend = "poetry.core.masonry.api"