update dependencies

This commit is contained in:
Dmitry Afanasyev 2023-10-15 13:16:09 +03:00
parent b3b2217115
commit ebc54ce14a
8 changed files with 1125 additions and 1258 deletions

View File

@ -50,7 +50,7 @@ class WebParser:
except StaleElementReferenceException: except StaleElementReferenceException:
pass pass
if not any([bus_arrival.get(bus_name) for bus_name in buses]): if not any(bus_arrival.get(bus_name) for bus_name in buses):
return f'Автобусов {", ".join(buses)} не найдено. \n\nСмотри на карте :)' return f'Автобусов {", ".join(buses)} не найдено. \n\nСмотри на карте :)'
answer = f'{message}\n\n' answer = f'{message}\n\n'

View File

@ -63,7 +63,7 @@ class BotScheduler:
self.scheduler.add_job( self.scheduler.add_job(
cron_jobs['job'], cron_jobs['job'],
kwargs=dict( kwargs=dict(
**cron_jobs.get('func_kwargs'), **cron.get('kwargs_per_job', {}) **cron_jobs.get('func_kwargs'), **cron.get('kwargs_per_job', {}) # type: ignore
), ),
**cron['time'], **cron['time'],
) )

View File

@ -1,4 +1,4 @@
FROM python:3.11.3 FROM python:3.11.6
ARG USER ARG USER
@ -15,7 +15,7 @@ ENV USER=${USER} \
POETRY_CACHE_DIR='/var/cache/pypoetry' \ POETRY_CACHE_DIR='/var/cache/pypoetry' \
PATH="$PATH:/root/.poetry/bin" \ PATH="$PATH:/root/.poetry/bin" \
DOCKER_CONTAINER=1 \ DOCKER_CONTAINER=1 \
POETRY_VERSION=1.4.2 POETRY_VERSION=1.6.1
RUN printf "================\n\nStart build app. USER is: "${USER}"\n\n===============\n" \ RUN printf "================\n\nStart build app. USER is: "${USER}"\n\n===============\n" \

View File

@ -1,9 +1,9 @@
{ {
"chrome": { "chrome": {
"default": "111.0", "default": "117.0",
"versions": { "versions": {
"111.0": { "117.0": {
"image": "selenoid/chrome:111.0", "image": "selenoid/chrome:117.0",
"port": "4444", "port": "4444",
"path": "/", "path": "/",
"tmpfs": { "tmpfs": {

View File

@ -16,7 +16,7 @@ networks:
services: services:
selenoid: selenoid:
image: "aerokube/selenoid:1.10.10" image: "aerokube/selenoid:1.11.0"
container_name: "transport_bot_selenoid" container_name: "transport_bot_selenoid"
hostname: "selenoid_host" hostname: "selenoid_host"
restart: unless-stopped restart: unless-stopped
@ -32,7 +32,7 @@ services:
- "4444" - "4444"
browser: browser:
image: "selenoid/chrome:111.0" image: "selenoid/chrome:117.0"
container_name: "transport_browser" container_name: "transport_browser"
bot: bot:
@ -60,7 +60,7 @@ services:
caddy: caddy:
image: "caddy:2.6.4" image: "caddy:2.7.5"
container_name: transport_bot_caddy container_name: transport_bot_caddy
hostname: transport_bot_caddy hostname: transport_bot_caddy
restart: unless-stopped restart: unless-stopped

2303
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -7,63 +7,63 @@ authors = ["Dmitry Afanasyev <Balshbox@gmail.com>"]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.11" python = "^3.11"
aiogram = "^2.2" aiogram = "^2.2"
selenium = "^4.8" selenium = "^4.14"
httpx = "^0.23" httpx = "^0.25"
wget = "^3.2" wget = "^3.2"
loguru = "^0.6" loguru = "^0.7"
python-decouple = "^3.8" python-decouple = "^3.8"
apscheduler = "^3.10" apscheduler = "^3.10"
gunicorn = "^20.1" gunicorn = "^21.2"
factory-boy = "^3.2.1" factory-boy = "^3.3"
Faker = "^18.3.0" Faker = "^18.3.0"
wheel = "^0.40" wheel = "^0.41"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
ipython = "^8.12.0" ipython = "^8.16"
pre-commit = "^3.2" pre-commit = "^3.5"
safety = "^2.3" safety = "^2.3"
pip-audit = "^2.5" pip-audit = "^2.6"
yamllint = "^1.30" yamllint = "^1.32"
tomlkit = "^0.11.7" tomlkit = "^0.12"
bandit = "^1.7" bandit = "^1.7"
aresponses = "^2.1" aresponses = "^2.1"
pyupgrade = "^3.3" pyupgrade = "^3.15"
isort = "^5.12" isort = "^5.12"
black = "^23.3" black = "^23.9"
mypy = "^1.2" mypy = "^1.6"
types-PyMySQL = "^1.0" types-PyMySQL = "^1.0"
types-python-dateutil = "^2.8" types-python-dateutil = "^2.8"
pytest = "^7.2" pytest = "^7.4"
pytest-asyncio = "^0.21" pytest-asyncio = "^0.21"
pytest-deadfixtures = "^2.2" pytest-deadfixtures = "^2.2"
pytest-testmon = "^2.0" pytest-testmon = "^2.0"
pytest-mock = "^3.10" pytest-mock = "^3.11"
pytest-cov = "^4.0" pytest-cov = "^4.1"
pytest-timeout = "^2.1" pytest-timeout = "^2.2"
pytest-sugar = "^0.9" pytest-sugar = "^0.9"
pytest-clarity = "^1.0" pytest-clarity = "^1.0"
pytest-env = "^0.8" pytest-env = "^1.0"
nest-asyncio = "^1.5" nest-asyncio = "^1.5"
autoflake = "^1.7" autoflake = "^2.2"
flake8 = "^5.0.4" flake8 = "^6.1"
flake8-logging-format = "^0.9" flake8-logging-format = "^0.9"
flake8-comprehensions = "^3.11" flake8-comprehensions = "^3.14"
flake8-eradicate = "^1.4" flake8-eradicate = "^1.5"
flake8-pytest-style = "^1.7" flake8-pytest-style = "^1.7"
flake8-aaa = "^0.14" flake8-aaa = "^0.16"
flake8-bugbear = "^23.3" flake8-bugbear = "^23.9"
flake8-debugger = "^4.1" flake8-debugger = "^4.1"
flake8-expression-complexity = "^0.0.11" flake8-expression-complexity = "^0.0.11"
flake8-fixme = "^1.1" flake8-fixme = "^1.1"
flake8-simplify = "^0.20" flake8-simplify = "^0.21"
flake8-variables-names = "^0.0.5" flake8-variables-names = "^0.0.6"
flake8-bandit = "^4.1" flake8-bandit = "^4.1"
flake8-tidy-imports = "^4.8" flake8-tidy-imports = "^4.10"
[tool.isort] [tool.isort]

View File

@ -10,7 +10,7 @@ networks:
services: services:
test-selenoid: test-selenoid:
image: "aerokube/selenoid:1.10.10" image: "aerokube/selenoid:1.11.0"
container_name: "test_transport_bot_selenoid" container_name: "test_transport_bot_selenoid"
hostname: "selenoid_host" hostname: "selenoid_host"
restart: unless-stopped restart: unless-stopped
@ -26,7 +26,7 @@ services:
- "4444" - "4444"
test-browser: test-browser:
image: "selenoid/chrome:111.0" image: "selenoid/chrome:117.0"
container_name: "test_transport_bot_browser" container_name: "test_transport_bot_browser"
test-bot: test-bot: