Skip to content

Commit 607c5d9

Browse files
Install quarto-cli as a devcontainer feature
1 parent 350a83c commit 607c5d9

File tree

10 files changed

+22
-20
lines changed

10 files changed

+22
-20
lines changed

.devcontainer/devcontainer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Do not edit this file directly.
2-
// This file is auto generated from the template file `scripts/devcontainer_templates/docker-compose.yml.jinja`.
2+
// This file is auto generated from the template file `scripts/devcontainer/templates/devcontainer.json.jinja`.
33
// If you need to make changes, please update the template file and regenerate this file
44
// by running pre-commit command `pre-commit run --all-files`
5-
// or by manually running the script `./scripts/devcontainer/generate_devcontainer.sh`.
5+
// or by manually running the script `./scripts/devcontainer/generate-devcontainers.sh`.
66
{
77
"name": "python-3.9",
88
"image": "mcr.microsoft.com/devcontainers/python:3.9",
@@ -51,6 +51,7 @@
5151
"ghcr.io/devcontainers/features/node:1": {},
5252
"ghcr.io/devcontainers/features/git:1": {},
5353
"ghcr.io/devcontainers/features/git-lfs:1": {},
54+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
5455
},
5556
"updateContentCommand": "bash .devcontainer/setup.sh",
5657
"customizations": {

.devcontainer/python-3.10/devcontainer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Do not edit this file directly.
2-
// This file is auto generated from the template file `scripts/devcontainer_templates/docker-compose.yml.jinja`.
2+
// This file is auto generated from the template file `scripts/devcontainer/templates/devcontainer.json.jinja`.
33
// If you need to make changes, please update the template file and regenerate this file
44
// by running pre-commit command `pre-commit run --all-files`
5-
// or by manually running the script `./scripts/devcontainer/generate_devcontainer.sh`.
5+
// or by manually running the script `./scripts/devcontainer/generate-devcontainers.sh`.
66
{
77
"name": "python-3.10",
88
"image": "mcr.microsoft.com/devcontainers/python:3.10",
@@ -51,6 +51,7 @@
5151
"ghcr.io/devcontainers/features/node:1": {},
5252
"ghcr.io/devcontainers/features/git:1": {},
5353
"ghcr.io/devcontainers/features/git-lfs:1": {},
54+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
5455
},
5556
"updateContentCommand": "bash .devcontainer/setup.sh",
5657
"customizations": {

.devcontainer/python-3.11/devcontainer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Do not edit this file directly.
2-
// This file is auto generated from the template file `scripts/devcontainer_templates/docker-compose.yml.jinja`.
2+
// This file is auto generated from the template file `scripts/devcontainer/templates/devcontainer.json.jinja`.
33
// If you need to make changes, please update the template file and regenerate this file
44
// by running pre-commit command `pre-commit run --all-files`
5-
// or by manually running the script `./scripts/devcontainer/generate_devcontainer.sh`.
5+
// or by manually running the script `./scripts/devcontainer/generate-devcontainers.sh`.
66
{
77
"name": "python-3.11",
88
"image": "mcr.microsoft.com/devcontainers/python:3.11",
@@ -51,6 +51,7 @@
5151
"ghcr.io/devcontainers/features/node:1": {},
5252
"ghcr.io/devcontainers/features/git:1": {},
5353
"ghcr.io/devcontainers/features/git-lfs:1": {},
54+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
5455
},
5556
"updateContentCommand": "bash .devcontainer/setup.sh",
5657
"customizations": {

.devcontainer/python-3.12/devcontainer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Do not edit this file directly.
2-
// This file is auto generated from the template file `scripts/devcontainer_templates/docker-compose.yml.jinja`.
2+
// This file is auto generated from the template file `scripts/devcontainer/templates/devcontainer.json.jinja`.
33
// If you need to make changes, please update the template file and regenerate this file
44
// by running pre-commit command `pre-commit run --all-files`
5-
// or by manually running the script `./scripts/devcontainer/generate_devcontainer.sh`.
5+
// or by manually running the script `./scripts/devcontainer/generate-devcontainers.sh`.
66
{
77
"name": "python-3.12",
88
"image": "mcr.microsoft.com/devcontainers/python:3.12",
@@ -51,6 +51,7 @@
5151
"ghcr.io/devcontainers/features/node:1": {},
5252
"ghcr.io/devcontainers/features/git:1": {},
5353
"ghcr.io/devcontainers/features/git-lfs:1": {},
54+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
5455
},
5556
"updateContentCommand": "bash .devcontainer/setup.sh",
5657
"customizations": {

.devcontainer/python-3.13/devcontainer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Do not edit this file directly.
2-
// This file is auto generated from the template file `scripts/devcontainer_templates/docker-compose.yml.jinja`.
2+
// This file is auto generated from the template file `scripts/devcontainer/templates/devcontainer.json.jinja`.
33
// If you need to make changes, please update the template file and regenerate this file
44
// by running pre-commit command `pre-commit run --all-files`
5-
// or by manually running the script `./scripts/devcontainer/generate_devcontainer.sh`.
5+
// or by manually running the script `./scripts/devcontainer/generate-devcontainers.sh`.
66
{
77
"name": "python-3.13",
88
"image": "mcr.microsoft.com/devcontainers/python:3.13",
@@ -51,6 +51,7 @@
5151
"ghcr.io/devcontainers/features/node:1": {},
5252
"ghcr.io/devcontainers/features/git:1": {},
5353
"ghcr.io/devcontainers/features/git-lfs:1": {},
54+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
5455
},
5556
"updateContentCommand": "bash .devcontainer/setup.sh",
5657
"customizations": {

.devcontainer/setup.sh

-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# update pip
22
pip install --upgrade pip
33

4-
# install pre-release of quarto for docs
5-
wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.7.7/quarto-1.7.7-linux-amd64.deb -O quarto.deb && \
6-
sudo dpkg -i quarto.deb && \
7-
rm quarto.deb
8-
94
# install dev packages
105
pip install -e ".[dev]"
116

.github/workflows/contrib-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ jobs:
868868
fail-fast: false
869869
matrix:
870870
os: [ubuntu-latest]
871-
python-version: ["3.13"]
871+
python-version: ["3.9"]
872872
steps:
873873
- uses: actions/checkout@v4
874874
with:

scripts/devcontainer/templates/devcontainer.json.jinja

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Do not edit this file directly.
2-
// This file is auto generated from the template file `scripts/devcontainer_templates/docker-compose.yml.jinja`.
2+
// This file is auto generated from the template file `scripts/devcontainer/templates/devcontainer.json.jinja`.
33
// If you need to make changes, please update the template file and regenerate this file
44
// by running pre-commit command `pre-commit run --all-files`
5-
// or by manually running the script `./scripts/devcontainer/generate_devcontainer.sh`.
5+
// or by manually running the script `./scripts/devcontainer/generate-devcontainers.sh`.
66
{
77
"name": "python-{{ python_version }}",
88
"image": "mcr.microsoft.com/devcontainers/python:{{ python_version }}",
@@ -51,6 +51,7 @@
5151
"ghcr.io/devcontainers/features/node:1": {},
5252
"ghcr.io/devcontainers/features/git:1": {},
5353
"ghcr.io/devcontainers/features/git-lfs:1": {},
54+
"ghcr.io/rocker-org/devcontainer-features/quarto-cli:1": {}
5455
},
5556
"updateContentCommand": "bash .devcontainer/setup.sh",
5657
"customizations": {

test/website/test_process_notebooks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def test_dir(self):
302302
image_url: https://github.com/davorrunje.png
303303
304304
davorinrusevljan:
305-
name: Davorin Ruševljan
305+
name: Davorin
306306
title: Developer
307307
url: https://github.com/davorinrusevljan
308308
image_url: https://github.com/davorinrusevljan.png
@@ -342,5 +342,5 @@ def test_add_authors_and_social_img(self, test_dir):
342342
assert '<p class="name">Mark Sze</p>' in actual
343343
assert '<p class="name">Tvrtko Sternak</p>' in actual
344344
assert '<p class="name">Davor Runje</p>' in actual
345-
assert '<p class="name">Davorin Ruševljan</p>' in actual
345+
assert '<p class="name">Davorin</p>' in actual
346346
assert '<p class="name">Chi Wang</p>' not in actual

website/process_notebooks.py

+1
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ def extract_example_group(metadata_path):
666666
"pages": ["notebooks/Notebooks"]
667667
+ [
668668
Path(item["source"])
669+
.resolve()
669670
.with_suffix("")
670671
.as_posix()
671672
.replace("/website/", "/")

0 commit comments

Comments
 (0)