Merge branch 'main' into annotation-line-break

PRQL · Jul 15, 2024 · a6b7531 · a6b7531
2 parents 8b9d45f + 39d6c5f
commit a6b7531
Show file tree

Hide file tree

Showing 92 changed files with 2,728 additions and 1,940 deletions.
diff --git a/.github/workflows/lint-megalinter.yaml b/.github/workflows/lint-megalinter.yaml
@@ -55,7 +55,7 @@ jobs:
 
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v7.11.1
+        uses: oxsecurity/megalinter@v7.13.0
 
         id: ml
 

diff --git a/.github/workflows/pull-request-target.yaml b/.github/workflows/pull-request-target.yaml
@@ -25,7 +25,7 @@ jobs:
           # - "internal" for code quality / ergonomics improvements
           # - "devops" for developer ergonomics
           # - "web" for playground / website (but not docs)
-          # - "tweak" for tiny changes
+          # - "refine" for tiny changes
           types: |
             feat
             fix
@@ -42,7 +42,7 @@ jobs:
             internal
             devops
             web
-            tweak
+            refine
 
   backport:
     # Backport to `web` branch on `pr-backport-web`

diff --git a/.mega-linter.yaml b/.mega-linter.yaml
@@ -41,5 +41,9 @@ DISABLE_ERRORS_LINTERS:
   # required in order to use ts-standard." was worth fixing, from #3608. Happy
   # for someone more informed to turn it back on.
   - TYPESCRIPT_STANDARD
+  # Disabled for now, as @max-sixty didn't know how to fix
+  # `./prqlc/bindings/php/tests/CompilerTest.php (trailing_comma_in_multiline)`.
+  # Fine for someone else to take a look.
+  - PHP_PHPCSFIXER
 PHP_PHPCS_ARGUMENTS:
   - --standard=PSR12
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
         # rustfmt handles rust files, and in some snapshots we expect trailing spaces.
         exclude: '.*\.(rs|snap)$'
   - repo: https://github.com/crate-ci/typos
-    rev: v1.22.9
+    rev: v1.23.1
     hooks:
       - id: typos
         # https://github.com/crate-ci/typos/issues/347
@@ -25,7 +25,7 @@ repos:
           # https://github.com/PRQL/prql/issues/3078
           - prettier-plugin-go-template
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.0
+    rev: v0.5.1
     hooks:
       - id: ruff
         args: [--fix]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@
 - Added `prqlc debug json-schema` command to auto-generate JSON Schema
   representations of commonly exposed IR types such as PL and RQ. (@kgutwin,
   #4698)
+- Add documentation comments to the output of the documentation generator.
+  (@vanillajonathan, #4729)
 
 **Fixes**: