Skip to content

Commit 70a81fc

Browse files
Improve how test suite is launched and add black.
1 parent bd7ef3e commit 70a81fc

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ FROM mcr.microsoft.com/devcontainers/base:bullseye
33

44
# [Optional] Uncomment this section to install additional OS packages.
55
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
6-
# && apt-get -y install --no-install-recommends <your-package-list-here>
6+
# && apt-get -y install --no-install-recommends <your-package-list-here>

.devcontainer/devcontainer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,30 @@
55
"dockerComposeFile": "docker-compose.yaml",
66
"service": "app",
77
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
8-
98
// Use this environment variable if you need to bind mount your local source code into a new container.
109
"remoteEnv": {
1110
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
1211
},
13-
1412
"features": {
1513
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
1614
"ghcr.io/devcontainers/features/git:1": {},
1715
"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {},
1816
"ghcr.io/eitsupi/devcontainer-features/jq-likes:1": {},
19-
"ghcr.io/guiyomh/features/vim:0": {}
17+
"ghcr.io/guiyomh/features/vim:0": {},
18+
"ghcr.io/devcontainers/features/python:1": {},
2019
},
20+
"postCreateCommand": "pip install black",
2121
"customizations": {
2222
"vscode": {
2323
"extensions": [
24-
// "ms-vscode-remote.remote-containers"
24+
"ms-python.python"
2525
]
2626
}
2727
}
2828
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2929
// "forwardPorts": [80]
30-
3130
// Use 'postCreateCommand' to run commands after the container is created.
3231
// "postCreateCommand": "docker --version",
33-
3432
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
3533
// "remoteUser": "root"
36-
}
34+
}

.devcontainer/docker-compose.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@ version: '3'
22

33
services:
44
app:
5-
build:
5+
build:
66
context: .
77
dockerfile: Dockerfile
88

99
volumes:
10-
# Forwards the local Docker socket to the container.
11-
# - /var/run/docker.sock:/var/run/docker-host.sock
1210
# Update this to wherever you want VS Code to mount the folder of your project
1311
- ../..:/workspaces:cached
1412

1513
# Overrides default command so things don't shut down after the process ends.
1614
entrypoint: /usr/local/share/docker-init.sh
1715
command: tail -f /dev/null
18-
1916
# Uncomment the next four lines if you will use a ptrace-based debuggers like C++, Go, and Rust.
2017
# cap_add:
2118
# - SYS_PTRACE

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ build/
2121
*.env
2222
docker-compose.yml
2323
notebook
24-
.vscode
2524
__main__.py
2625
jupyter_custom.js
2726
.eggs
2827
*.code-workspace
2928
docs/site
3029

3130

31+
!.vscode/settings.json
3232
!.devcontainer/devcontainer.json

.vscode/settings.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"editor.formatOnPaste": false,
3+
"editor.formatOnSave": true,
4+
"editor.rulers": [
5+
94
6+
],
7+
"python.formatting.provider": "black",
8+
"[python]": {
9+
"editor.defaultFormatter": null
10+
}
11+
}

LNX-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker compose -f LNX-docker-compose.yml --env-file LNX.env up --exit-code-from app --build
1+
# PY_VER=3.8 MYSQL_VER=5.7 DISTRO=alpine MINIO_VER=RELEASE.2022-08-11T04-37-28Z HOST_UID=$(id -u) docker compose -f LNX-docker-compose.yml up --exit-code-from app --build
22
version: '2.4'
33
x-net: &net
44
networks:

local-docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker compose -f local-docker-compose.yml --env-file LNX.env up --build
1+
# PY_VER=3.8 MYSQL_VER=5.7 DISTRO=alpine MINIO_VER=RELEASE.2022-08-11T04-37-28Z HOST_UID=$(id -u) docker compose -f local-docker-compose.yml up --build
22
version: '2.4'
33
x-net: &net
44
networks:

0 commit comments

Comments
 (0)