From 3f79a6e32d329531e99b05da5f83b4227f75fd2d Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Tue, 22 Feb 2022 13:38:05 +0100 Subject: fix --- .devcontainer/Dockerfile | 21 +++++++++++++++++ .devcontainer/devcontainer.json | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.json (limited to '.devcontainer') diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000..86dee1b --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,21 @@ +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/python-3/.devcontainer/base.Dockerfile + +# [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster +ARG VARIANT="3.10-bullseye" +FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} + +# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 +ARG NODE_VERSION="none" +RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi + +# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. +COPY requirements.txt /tmp/pip-tmp/ +RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ + && rm -rf /tmp/pip-tmp + +# [Optional] Uncomment this section to install additional OS packages. +# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ +# && apt-get -y install --no-install-recommends + +# [Optional] Uncomment this line to install global node packages. +# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..6970d3c --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,52 @@ +// 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.209.6/containers/python-3 +{ + "name": "Python 3", + "build": { + "dockerfile": "Dockerfile", + "context": "..", + "args": { + // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 + // Append -bullseye or -buster to pin to an OS version. + // Use -bullseye variants on local on arm64/Apple Silicon. + "VARIANT": "3.10", + // Options + "NODE_VERSION": "none" + } + }, + + // Set *default* container specific settings.json values on container create. + "settings": { + "python.defaultInterpreterPath": "/usr/local/bin/python", + "python.linting.enabled": false, + "python.linting.pylintEnabled": false, + "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", + "python.formatting.blackPath": "/usr/local/py-utils/bin/black", + "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", + "python.linting.banditPath": "/usr/local/py-utils/bin/bandit", + "python.linting.flake8Path": "/usr/local/py-utils/bin/flake8", + "python.linting.mypyPath": "/usr/local/py-utils/bin/mypy", + "python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle", + "python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle", + "python.linting.pylintPath": "/usr/local/py-utils/bin/pylint" + }, + + // Add the IDs of extensions you want installed when the container is created. + "extensions": [ + "ms-python.python", + // "ms-python.vscode-pylance" + ], + + // 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", + + // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. + "remoteUser": "vscode", + "features": { + "git": "os-provided", + "git-lfs": "latest" + } +} -- cgit v1.2.1 From e2dd6011ad2abcec220220f14efdb451c986aea3 Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Tue, 22 Feb 2022 13:54:04 +0100 Subject: fix --- .devcontainer/devcontainer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.devcontainer') diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6970d3c..626e731 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,7 @@ // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local on arm64/Apple Silicon. - "VARIANT": "3.10", + "VARIANT": "3.10-bullseye", // Options "NODE_VERSION": "none" } @@ -34,6 +34,7 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ "ms-python.python", + "tht13.html-preview-vscode", // "ms-python.vscode-pylance" ], -- cgit v1.2.1 From c9c95b13effa1840b921a0606936510d7eafa611 Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Tue, 22 Feb 2022 14:09:51 +0100 Subject: updates --- .devcontainer/Dockerfile | 3 +++ .devcontainer/devcontainer.json | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to '.devcontainer') diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 86dee1b..f50f4d2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -8,6 +8,9 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} ARG NODE_VERSION="none" RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi +RUN pip3 --disable-pip-version-check --no-cache-dir install -U pip pre-commit + + # [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. COPY requirements.txt /tmp/pip-tmp/ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 626e731..c3fc20e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -18,8 +18,8 @@ // Set *default* container specific settings.json values on container create. "settings": { "python.defaultInterpreterPath": "/usr/local/bin/python", - "python.linting.enabled": false, - "python.linting.pylintEnabled": false, + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8", "python.formatting.blackPath": "/usr/local/py-utils/bin/black", "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf", -- cgit v1.2.1 From 1987cc7f22a139fbd2ead1223ab878cddccd3f96 Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Sun, 27 Feb 2022 13:07:33 +0100 Subject: fix --- .devcontainer/Dockerfile | 15 ++++++++++++--- .devcontainer/act4e-check | 16 ++++++++++++++++ .devcontainer/requirements.txt | 2 ++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 .devcontainer/act4e-check create mode 100644 .devcontainer/requirements.txt (limited to '.devcontainer') diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f50f4d2..120994e 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,9 +10,8 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/ RUN pip3 --disable-pip-version-check --no-cache-dir install -U pip pre-commit - # [Optional] If your pip requirements rarely change, uncomment this section to add them to the image. -COPY requirements.txt /tmp/pip-tmp/ +COPY .devcontainer/requirements.txt /tmp/pip-tmp/ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \ && rm -rf /tmp/pip-tmp @@ -21,4 +20,14 @@ RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requ # && apt-get -y install --no-install-recommends # [Optional] Uncomment this line to install global node packages. -# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 \ No newline at end of file +# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 + +COPY .devcontainer/act4e-check /usr/local/bin +RUN chmod +x /usr/local/bin/act4e-check + + +COPY src src +COPY setup.py . + +RUN python3 -m pip install -e . + diff --git a/.devcontainer/act4e-check b/.devcontainer/act4e-check new file mode 100644 index 0000000..d4fd9e7 --- /dev/null +++ b/.devcontainer/act4e-check @@ -0,0 +1,16 @@ +#!/bin/bash +set -eux +if [ $# -eq 0 ] + then + act4e-test --collections act4e_checks --module act4e_solutions +else +if [ $# -eq 1 ] + then + act4e-test --collections act4e_checks --module act4e_solutions --group $1 +else + echo "Need to pass either 0 or 1 argument" + exit 3 +fi +fi + + diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt new file mode 100644 index 0000000..28fee9e --- /dev/null +++ b/.devcontainer/requirements.txt @@ -0,0 +1,2 @@ +ACT4E-exercises +pre-commit \ No newline at end of file -- cgit v1.2.1 From a3127ad923f712d23b8d66798c704c1084d8b7f1 Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Wed, 2 Mar 2022 15:34:44 +0100 Subject: Update Dockerfile --- .devcontainer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.devcontainer') diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 120994e..601075b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -26,8 +26,8 @@ COPY .devcontainer/act4e-check /usr/local/bin RUN chmod +x /usr/local/bin/act4e-check -COPY src src -COPY setup.py . +# COPY src src +# COPY setup.py . -RUN python3 -m pip install -e . +# RUN python3 -m pip install -e . -- cgit v1.2.1 From b24b147b3456b3afdb51fb03253da1de3478d63e Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Thu, 26 Oct 2023 13:37:42 +0200 Subject: misc --- .devcontainer/devcontainer.json | 4 ++-- .devcontainer/requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to '.devcontainer') diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c3fc20e..70c3683 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -47,7 +47,7 @@ // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode", "features": { - "git": "os-provided", - "git-lfs": "latest" + "git": "os-provided" + //"git-lfs": "latest" } } diff --git a/.devcontainer/requirements.txt b/.devcontainer/requirements.txt index 28fee9e..e36b067 100644 --- a/.devcontainer/requirements.txt +++ b/.devcontainer/requirements.txt @@ -1,2 +1,2 @@ -ACT4E-exercises -pre-commit \ No newline at end of file +ACT4E-exercises>=7.3.2310261331 +pre-commit -- cgit v1.2.1 From 636bb42728d3997039524657bc5ead5c27ab6a2e Mon Sep 17 00:00:00 2001 From: Andrea Censi Date: Thu, 26 Oct 2023 16:48:44 +0200 Subject: misc --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.devcontainer') diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 70c3683..0754889 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -34,7 +34,7 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ "ms-python.python", - "tht13.html-preview-vscode", + "tht13.html-preview-vscode" // "ms-python.vscode-pylance" ], -- cgit v1.2.1