Compare commits

...

2 Commits

Author SHA1 Message Date
26dd083fad ignore aiohttp vulnerabilities 2024-01-04 01:48:29 +03:00
7436e6891c update dependencies 2024-01-04 01:31:27 +03:00
8 changed files with 484 additions and 425 deletions

View File

@ -23,13 +23,13 @@ jobs:
id: setup-python id: setup-python
uses: actions/setup-python@v3 uses: actions/setup-python@v3
with: with:
python-version: '3.11.3' python-version: '3.11.7'
#---------------------------------------------- #----------------------------------------------
# ----- install & configure poetry ----- # ----- install & configure poetry -----
#---------------------------------------------- #----------------------------------------------
- name: Install poetry - name: Install poetry
env: # Keep in sync with `POETRY_VERSION` in `Dockerfile` env: # Keep in sync with `POETRY_VERSION` in `Dockerfile`
POETRY_VERSION: "1.4.2" POETRY_VERSION: "1.7.1"
run: | run: |
curl -sSL "https://install.python-poetry.org" | python - curl -sSL "https://install.python-poetry.org" | python -
# Adding `poetry` to `$PATH`: # Adding `poetry` to `$PATH`:
@ -54,7 +54,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.in-project true poetry config virtualenvs.in-project true
poetry install poetry install --no-root
poetry run pip install -U pip poetry run pip install -U pip
#---------------------------------------------- #----------------------------------------------
# run test suite # run test suite

View File

@ -23,13 +23,13 @@ jobs:
id: setup-python id: setup-python
uses: actions/setup-python@v3 uses: actions/setup-python@v3
with: with:
python-version: '3.11.3' python-version: '3.11.7'
#---------------------------------------------- #----------------------------------------------
# ----- install & configure poetry ----- # ----- install & configure poetry -----
#---------------------------------------------- #----------------------------------------------
- name: Install poetry - name: Install poetry
env: # Keep in sync with `POETRY_VERSION` in `Dockerfile` env: # Keep in sync with `POETRY_VERSION` in `Dockerfile`
POETRY_VERSION: "1.4.2" POETRY_VERSION: "1.7.1"
run: | run: |
curl -sSL "https://install.python-poetry.org" | python - curl -sSL "https://install.python-poetry.org" | python -
# Adding `poetry` to `$PATH`: # Adding `poetry` to `$PATH`:
@ -55,7 +55,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
poetry config virtualenvs.in-project true poetry config virtualenvs.in-project true
poetry install poetry install --no-root
poetry run pip install -U pip poetry run pip install -U pip
#---------------------------------------------- #----------------------------------------------
# run test suite # run test suite
@ -69,8 +69,9 @@ jobs:
poetry run coverage run -m pytest poetry run coverage run -m pytest
poetry run coverage report poetry run coverage report
- name: Extended checks - name: Extended checks
continue-on-error: true
run: | run: |
poetry run poetry check poetry run poetry check
poetry run pip check poetry run pip check
poetry run safety check --full-report poetry run safety check --ignore=62583 --ignore=62582 --full-report
poetry run pip-audit poetry run pip-audit

View File

@ -1,4 +1,4 @@
FROM python:3.11.6 FROM python:3.11.7
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.6.1 POETRY_VERSION=1.7.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" \
@ -54,7 +54,7 @@ RUN poetry --version \
&& poetry run pip install -U pip \ && poetry run pip install -U pip \
&& poetry install \ && poetry install \
$(if [ "$USER" != 'root' ]; then echo '--only main'; fi) \ $(if [ "$USER" != 'root' ]; then echo '--only main'; fi) \
--no-interaction --no-ansi \ --no-interaction --no-ansi --no-root\
# Cleaning poetry installation's cache for production: # Cleaning poetry installation's cache for production:
&& if [ "$USER" != 'root' ]; then rm -rf "$POETRY_CACHE_DIR"; fi && if [ "$USER" != 'root' ]; then rm -rf "$POETRY_CACHE_DIR"; fi

View File

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

View File

@ -16,7 +16,7 @@ networks:
services: services:
selenoid: selenoid:
image: "aerokube/selenoid:1.11.0" image: "aerokube/selenoid:1.11.1"
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:119.0" image: "selenoid/chrome:120.0"
container_name: "transport_browser" container_name: "transport_browser"
bot: bot:
@ -60,7 +60,7 @@ services:
caddy: caddy:
image: "caddy:2.7.5" image: "caddy:2.7.6"
container_name: transport_bot_caddy container_name: transport_bot_caddy
hostname: transport_bot_caddy hostname: transport_bot_caddy
restart: unless-stopped restart: unless-stopped

850
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,14 @@
[tool.poetry] [tool.poetry]
name = "mosgortrans" name = "mosgortrans"
version = "0.7.1" version = "1.1.1"
description = "Bot to help with mosgortans" description = "Bot to help with mosgortans"
authors = ["Dmitry Afanasyev <Balshbox@gmail.com>"] authors = ["Dmitry Afanasyev <Balshbox@gmail.com>"]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.11" python = "^3.11"
aiogram = "^2.25" aiogram = "^2.25"
selenium = "^4.15" selenium = "^4.16"
httpx = "^0.25" httpx = "^0.26"
wget = "^3.2" wget = "^3.2"
loguru = "^0.7" loguru = "^0.7"
python-decouple = "^3.8" python-decouple = "^3.8"
@ -17,11 +17,11 @@ gunicorn = "^21.2"
factory-boy = "^3.3" factory-boy = "^3.3"
Faker = "^18.3.0" Faker = "^18.3.0"
wheel = "^0.41" wheel = "^0.42"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
ipython = "^8.17" ipython = "^8.18"
pre-commit = "^3.5" pre-commit = "^3.6"
safety = "^2.3" safety = "^2.3"
pip-audit = "^2.6" pip-audit = "^2.6"
yamllint = "^1.33" yamllint = "^1.33"
@ -30,15 +30,15 @@ bandit = "^1.7"
aresponses = "^2.1" aresponses = "^2.1"
pyupgrade = "^3.15" pyupgrade = "^3.15"
isort = "^5.12" isort = "^5.13"
black = "^23.11" black = "^23.12"
mypy = "^1.7" mypy = "^1.8"
types-PyMySQL = "^1.0" types-PyMySQL = "^1.0"
types-python-dateutil = "^2.8" types-python-dateutil = "^2.8"
pytest = "^7.4" pytest = "^7.4"
pytest-asyncio = "^0.21" pytest-asyncio = "^0.23"
pytest-deadfixtures = "^2.2" pytest-deadfixtures = "^2.2"
pytest-testmon = "^2.1" pytest-testmon = "^2.1"
pytest-mock = "^3.12" pytest-mock = "^3.12"
@ -56,7 +56,7 @@ flake8-comprehensions = "^3.14"
flake8-eradicate = "^1.5" flake8-eradicate = "^1.5"
flake8-pytest-style = "^1.7" flake8-pytest-style = "^1.7"
flake8-aaa = "^0.17" flake8-aaa = "^0.17"
flake8-bugbear = "^23.9" flake8-bugbear = "^23.12"
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"

View File

@ -10,7 +10,7 @@ networks:
services: services:
test-selenoid: test-selenoid:
image: "aerokube/selenoid:1.11.0" image: "aerokube/selenoid:1.11.1"
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:119.0" image: "selenoid/chrome:120.0"
container_name: "test_transport_bot_browser" container_name: "test_transport_bot_browser"
test-bot: test-bot: