Skip to content

Commit 42ba61e

Browse files
committed
chore: some updates to devcontainers
1 parent 1161451 commit 42ba61e

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN echo '' >> /etc/skel/.zshrc \
3434
RUN sudo -u aur yay -S --needed --noconfirm openssh python python-pip python-setuptools python-pipenv python-pipx nodejs npm npm-check-updates
3535

3636
# configure python
37-
RUN sudo -u aur yay -S --needed --noconfirm python38 python39 python311
37+
RUN sudo -u aur yay -S --needed --noconfirm python38 python39 python310
3838

3939
RUN echo '' >> /etc/skel/.zshrc \
4040
&& echo 'if [ -d "$HOME/.local/bin" ] ; then' >> /etc/skel/.zshrc \
@@ -49,4 +49,6 @@ RUN pipx install hatch
4949
RUN pipx install python-semantic-release
5050
RUN pipx install pre-commit
5151

52+
hatch config set dirs.env.virtual ".hatch"
53+
5254
ENV SHELL=/usr/bin/zsh

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// "forwardPorts": [],
1616

1717
// Use 'postCreateCommand' to run commands after the container is created.
18-
// "postCreateCommand": "uname -a",
18+
"postCreateCommand": "bash -i -c 'npm install --also-dev && hatch env create devel'",
1919

2020
// Configure tool-specific properties.
2121
// "customizations": {},
@@ -66,7 +66,8 @@
6666
"git.enableSmartCommit": true,
6767
"python.analysis.diagnosticMode": "workspace",
6868
"ruff.importStrategy": "fromEnvironment",
69-
"python.linting.enabled": true
69+
"python.linting.enabled": true,
70+
"python.venvPath": "${workspaceFolder}/.hatch"
7071
}
7172
}
7273
}

hatch.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ create-json-schema = "python ./scripts/create_robot_toml_json_schema.py"
4242
install-packages = "python ./scripts/install_packages.py"
4343

4444
[envs.rfmaster]
45-
python = "310"
45+
python = "3.11"
4646
extra-dependencies=[
4747
"robotframework @ git+https://github.com/robotframework/robotframework.git"
4848
]
4949

5050

5151
[envs.devel]
52-
python = "38"
52+
python = "3.8"
5353

5454
[[envs.devel.matrix]]
55-
python = ["38", "39", "310", "311"]
55+
python = ["3.8", "3.9", "3.10", "3.11"]
5656
rf = ["rf41", "rf50", "rf60", "rf61b1"]
5757

5858
[envs.devel.overrides]

0 commit comments

Comments
 (0)