Skip to content

Commit 8818485

Browse files
cscheidcscheid
committed
merge
2 parents 13b9052 + c1c4c6f commit 8818485

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4195
-3266
lines changed

‎CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ authors:
2020
given-names: "Gordon"
2121
orcid: "https://orcid.org/0009-0005-1809-8936"
2222
title: "Quarto"
23-
version: 1.6
23+
version: 1.7
2424
doi: 10.5281/zenodo.5960048
25-
date-released: 2024-11-27
25+
date-released: 2025-04-28
2626
url: "https://github.com/quarto-dev/quarto-cli"

‎configuration

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export DENO=v2.2.10
1515
# TODO figure out where 0.1.41 apple silicon libs are available
1616
export DENO_DOM=v0.1.41-alpha-artifacts
1717
export PANDOC=3.6.3
18-
export DARTSASS=1.85.1
19-
export ESBUILD=0.19.12
18+
export DARTSASS=1.87.0
19+
export ESBUILD=0.25.3
2020
export TYPST=0.13.0
2121

2222

@@ -61,7 +61,7 @@ export ALGOLIA_SEARCH_INSIGHTS_JS=2.0.3
6161

6262

6363
# Quarto Info Version
64-
export QUARTO_VERSION=1.7
64+
export QUARTO_VERSION=1.8
6565
export QUARTO_NAME=Quarto
6666

6767
# Folder names. These are not the same as paths (those variable names end in _PATH).

‎dev-docs/checklist-make-a-new-quarto-release.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@
22
- [ ] create a branch `v1.x`, where x is the version being released
33
- `git checkout -b v1.4`
44
- `git push origin v1.4`
5-
- [ ] mark the current release as the stable release in the `main` branch
5+
- [ ] mark the current release as the new release in the `main` branch
66
- [ ] edit QUARTO_VERSION line in `/configuration` to be the new version (e.g. `1.5`)
77
- [ ] push the changes to the `main` branch
88
- [ ] kick off a v1.5 build in GHA: https://github.com/quarto-dev/quarto-cli/actions/workflows/create-release.yml
99
- [ ] ensure the build completes successfully
1010
- [ ] mark v1.4 release as stable
11-
- go to https://github.com/quarto-dev/quarto-cli/releases
12-
- find the latest v1.4 release and edit, (eg https://github.com/quarto-dev/quarto-cli/releases/edit/v1.4.549)
13-
- at the bottom of the page, there will be two checkboxes, "Set as pre-release" and "Set as latest release":
14-
- "Set as pre-release" should be unchecked, and
15-
- "Set as latest release" should be checked.
11+
- [ ] go to https://github.com/quarto-dev/quarto-cli/releases
12+
- [ ] find the latest v1.4 release and edit, (eg https://github.com/quarto-dev/quarto-cli/releases/edit/v1.4.549)
13+
- [ ] at the bottom of the page, there will be two checkboxes, "Set as pre-release" and "Set as latest release":
14+
- [ ] "Set as pre-release" should be unchecked, and
15+
- [ ] "Set as latest release" should be checked.
1616
- [ ] once the v1.5 build completes, edit the quarto.org website configuration on https://github.com/quarto-dev/quarto-web to reflect the new version
1717
- this means flipping the profile group configuration in `_quarto.yml` from `[rc,prelease]` to `[prerelease,rc]`
1818
- [ ] push the changes to the `main` branch
1919
- [ ] quarto-dev/quarto-web changes
20-
2120
- wait for the downloads file to be automatically updated by the GitHub Action on https://github.com/quarto-dev/quarto-web
2221
- [ ] wait for https://github.com/quarto-dev/quarto-web/actions/workflows/update-downloads.yml to run (it runs every 15 minutes, or you can manually trigger it)
2322
- This workflow run rendered the website: https://github.com/quarto-dev/quarto-web/actions/runs/12016407762
@@ -30,20 +29,22 @@
3029
- [ ] create `docs/prerelease/1.5/{_highlights, index, _pre-release-feature}.qmd` files based on the ones from the previous release
3130
- [ ] change `docs/prerelease/_highlights.qmd` so its include points to the new version-specific `_highlights.qmd` file (here, 1.5)
3231
- [ ] change `docs/prerelease/_highlights-release.qmd` so its include points to the new version-specific `_highlights.qmd` file (here, 1.4)
33-
- [ ] add the stable version to the older downloads list, like [this example](https://github.com/quarto-dev/quarto-web/commit/85ef62ec5036026d62d57f9cfb190d8b923b2d43)
34-
- [ ] run `quarto run tools/release-notes.R` to generate the release notes
32+
- [ ] add the stable version to the older downloads list by editing /docs/download/_download-older.yml
33+
- [ ] run `quarto run tools/release-notes.R` to generate the release notes
3534
- [ ] push the changes to `prerelease` branch, ensure they build correctly
36-
- [ ] Merge the `prerelease` branch into `main`
35+
- [ ] Merge the `prerelease` branch into `main`, push to `main`
3736
- [ ] ensure the build completes successfully
38-
- [ ] Merge `main` into `prerelease`
37+
- [ ] Merge `main` into `prerelease`, push to `prerelease`
3938
- [ ] ensure the build completes successfully
40-
- [ ] Create new tag on `main` (here, `v1.5`)
41-
- [ ] `git tag -a v1.5 -m "v1.5"`
42-
- [ ] `git push origin v1.5`
39+
- [ ] Create new tag on `main` with stable release version number (here, `v1.4`) to mark when the new main site version went live
40+
- [ ] `git tag -a v1.4 -m "v1.4"`
41+
- [ ] `git push origin v1.4`
4342
- [ ] Update `prerelease` version number (here, `v1.5`)
4443
- [ ] edit `_quarto-prerelease-docs.yml` to point to the new version
4544
- [ ] publish the release blog post that should exist in https://github.com/quarto-dev/quarto-web/tree/main/docs/blog/posts
46-
by removing the `draft: true` line in the metadata and changing the date to match the release date. Do this on a branch off of `main` to trigger our PR automation to make the corresponding change to `prerelease`.
45+
- [ ] Create a branch off of `main` (to trigger our PR automation to make the corresponding change to `prerelease`).
46+
- [ ] Removing the `draft: true` line in the metadata
47+
- [ ] Change the date to match the release date.
4748

4849
- [ ] Update https://github.com/quarto-dev/quarto-cli/blob/main/CITATION.cff
4950
- [ ] Packaging and package managers, etc
@@ -55,8 +56,8 @@
5556
- Check the "Whether to publish or not the package on chocolatey" checkbox
5657
- Wait for @cderv to receive email confirmation, no action needed
5758
- [ ] pypi
58-
- Goto the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
59-
- Update `version.txt` to be the version you'd like to publish and commit
59+
- Go to the [quarto-cli-pypi repo](https://github.com/quarto-dev/quarto-cli-pypi)
60+
- [ ] Update `version.txt` to be the version you'd like to publish and commit
6061
- Go to actions
6162
- Select 'Publish Quarto PyPi'
6263
- [ ] Click "Run Workflow"

‎dev-docs/feature-format-matrix/qmd-files/callout/appearance-minimal.qmd

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: Callout with minimal appearance
3+
format:
4+
html:
5+
quality: 1
6+
---
7+
8+
::: {.callout-note appearance="minimal"}
9+
10+
## Title
11+
12+
{{< lipsum 1 >}}
13+
14+
:::

‎dev-docs/feature-format-matrix/qmd-files/callout/appearance-simple.qmd

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
title: Callout with simple appearance
3+
format:
4+
html:
5+
quality: 1
6+
---
7+
8+
::: {.callout-note appearance="simple"}
9+
10+
## Title
11+
12+
{{< lipsum 1 >}}
13+
14+
:::

‎dev-docs/feature-format-matrix/qmd-files/callout/collapse.qmd

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
title: Callouts
3+
format:
4+
html:
5+
quality: 2
6+
_quarto:
7+
tests:
8+
html:
9+
ensureHtmlElements:
10+
-
11+
- "div.callout-header.collapsed ~ div#callout-1.collapse"
12+
- "div.callout-header:not(.collapsed) ~ div#callout-2.collapse.show"
13+
---
14+
15+
::: {.callout-note collapse="true"}
16+
17+
## A small note
18+
19+
You should note that this is a note.
20+
21+
:::
22+
23+
::: {.callout-note collapse="false"}
24+
25+
## A small note
26+
27+
You should note that this is a note.
28+
29+
:::

‎dev-docs/feature-format-matrix/qmd-files/callout/document.qmd

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: Callouts
33
format:
4-
docusaurus-md:
5-
quality: 1
64
html:
75
quality: 2
6+
docusaurus-md:
7+
quality: 1
88
dashboard:
99
quality: 0
1010
comment: "Bug: Callout icons show on a separate line from the title."
@@ -52,4 +52,35 @@ You should note that this is a note.
5252

5353
A callout does not need a title.
5454

55-
:::
55+
:::
56+
57+
::: {.callout-note}
58+
59+
## A callout does not need content
60+
61+
:::
62+
63+
::: {.callout-note}
64+
65+
:::
66+
67+
::: {.callout-note collapse="true" appearance="minimal"}
68+
69+
## A small note
70+
71+
You should note that this is a note.
72+
73+
:::
74+
75+
::: {.callout}
76+
77+
:::
78+
79+
::: {.callout}
80+
81+
## Title
82+
83+
Content
84+
85+
:::
86+

‎dev-docs/feature-format-matrix/qmd-files/callout/no-content.qmd

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
title: Callout with no content
3+
format:
4+
html:
5+
quality: 1
6+
---
7+
8+
::: {.callout-note}
9+
10+
## Title
11+
12+
:::

‎dev-docs/feature-format-matrix/qmd-files/callout/no-icon.qmd

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
title: Callout with no icon
3+
format:
4+
html:
5+
quality: 0
6+
comment: Title is a offset a little too far down
7+
---
8+
9+
::: {.callout-note icon="false"}
10+
11+
## Title
12+
13+
{{< lipsum 1 >}}
14+
15+
:::

‎dev-docs/feature-format-matrix/qmd-files/callout/no-title.qmd

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
title: Callout with no title
3+
format:
4+
html:
5+
quality: 1
6+
---
7+
8+
::: {.callout-note}
9+
10+
{{< lipsum 1 >}}
11+
12+
:::

0 commit comments

Comments
 (0)