diff --git a/.env b/.env index 5ae46eb..28a783a 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ PYTHONPATH=./ -VERSION=23.10.15 +VERSION=24.01.02 diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml index 9da89cb..fd0d9cb 100644 --- a/.github/workflows/build_image.yml +++ b/.github/workflows/build_image.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build the base image - run: docker build -t secretaryweb-base:23.10.15 -f ./Dockerfile-base ./ + run: docker build -t secretaryweb-base:24.01.02 -f ./Dockerfile-base ./ - name: List images run: docker images - name: Rename sample setting file diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index d4518a1..a984b83 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: ["ubuntu-20.04", "ubuntu-22.04"] - python-version: ["3.11"] + python-version: ["3.11", "3.12"] runs-on: ${{ matrix.os }} steps: - name: Checkout @@ -36,7 +36,7 @@ jobs: - name: Install and configure Poetry uses: snok/install-poetry@v1 with: - version: 1.6.1 + version: 1.7.1 virtualenvs-create: true virtualenvs-in-project: true installer-parallel: true diff --git a/.vscode/settings.json b/.vscode/settings.json index e614351..9033097 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,12 +1,5 @@ { "python.analysis.typeCheckingMode": "basic", - "python.linting.pylintEnabled": true, - "python.linting.enabled": true, - "python.linting.mypyEnabled": true, - "python.linting.mypyArgs": [ - "--strict" - ], - "python.formatting.provider": "autopep8", "python.testing.unittestEnabled": false, "python.testing.pytestEnabled": true, "python.testing.pytestArgs": [ @@ -19,6 +12,15 @@ "python.envFile": "${workspaceFolder}/.env", "python.defaultInterpreterPath": "${workspaceFolder}/.venv", "[python]": { - "editor.defaultFormatter": "ms-python.autopep8" - } + "editor.defaultFormatter": "ms-python.autopep8", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.organizeImports": true + }, + }, + "isort.args": [ + "--src=${workspaceFolder}", + "--line-length=100", + ], + "isort.check": true } diff --git a/Dockerfile-app b/Dockerfile-app index 22c4f8f..caff9d3 100644 --- a/Dockerfile-app +++ b/Dockerfile-app @@ -1,4 +1,4 @@ -FROM secretaryweb-base:23.10.15 +FROM secretaryweb-base:24.01.02 ADD ./client_secret.json ./client_secret.json ADD ./main.py ./main.py diff --git a/Dockerfile-base b/Dockerfile-base index 0a98de1..81f14fd 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -1,4 +1,4 @@ -FROM python:3.11.4-alpine3.18 +FROM python:3.11.7-alpine3.19 WORKDIR /app ADD pyproject.toml poetry.lock ./ diff --git a/Dockerfile-base-dev b/Dockerfile-base-dev index f8c7088..41e91a8 100644 --- a/Dockerfile-base-dev +++ b/Dockerfile-base-dev @@ -1,4 +1,4 @@ -FROM python:3.11.4-alpine3.18 +FROM python:3.11.7-alpine3.19 WORKDIR /app ADD pyproject.toml poetry.lock ./ diff --git a/build-base.sh b/build-base.sh index 259d312..0f41fa5 100644 --- a/build-base.sh +++ b/build-base.sh @@ -1 +1 @@ -docker build --no-cache=true -t secretaryweb-base:23.10.15 -f ./Dockerfile-base ./ +docker build --no-cache=true -t secretaryweb-base:24.01.02 -f ./Dockerfile-base ./ diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 2e41099..1eb08d0 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.25.2-alpine +FROM nginx:1.25.3-alpine COPY ./nginx.conf /etc/nginx/nginx.conf diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 8ed8cbc..0000000 --- a/requirements.txt +++ /dev/null @@ -1,16 +0,0 @@ -google-api-python-client -google-auth -google-auth-httplib2 -google-auth-oauthlib - -arrow -blinker -boto3 -celery<6 -flask -markdown -phonenumbers -pylibmc -pymongo -requests -uwsgi