diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 68d321e..e102104 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,20 +1,3 @@ -FROM python:3.11-buster AS builder - - -COPY requirements.txt /requirements.txt -RUN pip install --user -r requirements.txt - - -FROM python:3.11-slim - -ENV MPLBACKEND=Agg - -COPY --from=builder /root/.local /root/.local - -RUN pip install --no-cache-dir black -ENV TELEGRAM=TOKEN -ENV MARKETDATA=TOKEN - -COPY . . - -# CMD [ "python", "./bot.py" ] +FROM python:3.11 + +COPY . . diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index de09b46..830e765 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,26 +1,41 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/docker-existing-dockerfile +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/python { - "name": "DockerDev", - // Sets the run context to one level up instead of the .devcontainer folder. - "context": "..", - // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. - "dockerFile": "Dockerfile", - // Set *default* container specific settings.json values on container create. - "settings": {}, - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "ms-python.python", - "ms-azuretools.vscode-docker" - ] - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Uncomment the next line to run commands after the container is created - for example installing curl. - // "postCreateCommand": "apt-get update && apt-get install -y curl", - // Uncomment when using a ptrace-based debugger like C++, Go, and Rust - // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker. - // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ], - // Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root. - // "remoteUser": "vscode" -} \ No newline at end of file + "name": "Python 3", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + // "image": "mcr.microsoft.com/devcontainers/python:1-3-bookworm", + "build": { "dockerfile": "Dockerfile" }, + "features": { + "ghcr.io/devcontainers-contrib/features/black:2": {}, + "ghcr.io/devcontainers-contrib/features/mypy:2": {}, + "ghcr.io/devcontainers-contrib/features/pylint:2": {}, + "ghcr.io/devcontainers/features/docker-in-docker": {} + }, + "customizations": { + "vscode": { + "extensions": [ + "ms-python.black-formatter", + "ms-python.flake8", + "ms-python.vscode-pylance", + "ms-python.python" + ] + } + }, + + "postCreateCommand": "pip3 install --user -r dev-reqs.txt" + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "pip3 install --user -r requirements.txt", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 35f8a4e..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "configurations": [ - { - "name": "Telegram Bot", - "type": "python", - "request": "launch", - "program": "bot.py", - "console": "integratedTerminal", - "python": "python3.11" - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index e2640e2..569447a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,8 @@ { - "python.formatting.provider": "black", + "python.formatting.provider": "none", "python.linting.mypyEnabled": true, "python.linting.flake8Enabled": true, + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter", + } } \ No newline at end of file