Merge branch 'PRQL:main' into main

.devcontainer/devcontainer.json

@@ -1,4 +1,4 @@
-// Dev Container for Rust, website, prql-js and prqlc-python
+// Dev Container for Rust, website, prqlc-js and prqlc-python
 {
   "image": "ghcr.io/prql/prql-devcontainer-base:latest",
   "features": {
@@ -17,7 +17,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
-        // Keep in sync with Taskfile.yml
+        // Keep in sync with Taskfile.yaml
         "prql-lang.prql-vscode",
         "rust-lang.rust-analyzer",
         "mitsuhiko.insta",

.github/actions/build-python/action.yaml

@@ -22,7 +22,7 @@ runs:
         --arg package_name ${{ inputs.package }} '.packages[] | select(.name ==
         $package_name) | .manifest_path')" >>"$GITHUB_OUTPUT"
       shell: bash
-    # There's benefit from caching here, because the maturin action uses a container.
+    # There's no benefit from caching here, because the maturin action uses a container.
     - uses: PyO3/maturin-action@v1
       if: inputs.target == 'source'
       with:

.github/workflows/build-devcontainer.yaml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Prep args
         run: |
-          echo "cargo_crates=$(yq -r '.vars.cargo_crates' Taskfile.yml)" >>"$GITHUB_ENV"
+          echo "cargo_crates=$(yq -r '.vars.cargo_crates' Taskfile.yaml)" >>"$GITHUB_ENV"
 
       - name: Build
         uses: docker/build-push-action@v5

.github/workflows/build-web.yaml

@@ -36,7 +36,6 @@ jobs:
       - uses: baptiste0928/cargo-install@v3
         with:
           crate: mdbook-admonish
-
       - uses: baptiste0928/cargo-install@v3
         with:
           crate: wasm-pack
@@ -49,7 +48,6 @@ jobs:
           cache-dependency-path: "**/package-lock.json"
 
       - run: ./.github/workflows/scripts/set_version.sh
-
       - name: 💰 Cache
         uses: Swatinem/rust-cache@v2
         with:

.github/workflows/release.yaml

@@ -111,7 +111,7 @@ jobs:
           append_body: true
           files: ${{ steps.build-artifact.outputs.artifact-name }}
 
-  winget-release:
+  publish-winget:
     runs-on: ubuntu-latest
     needs: build-prqlc
     if: github.event_name == 'release'
@@ -315,15 +315,16 @@ jobs:
         with:
           # `*` covers target & OS
           pattern: ${{ matrix.package }}-*-release
+          merge-multiple: true
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env:
           MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
         with:
           command: upload
-          args: --skip-existing **/*{.whl,.tar.gz}
+          args: --skip-existing *
 
-  publish-prql-js:
+  publish-js:
     runs-on: ubuntu-latest
     steps:
       - name: 📂 Checkout code
@@ -338,6 +339,15 @@ jobs:
           node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
 
+      - run: ./.github/workflows/scripts/set_version.sh
+      - name: 💰 Cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          prefix-key: ${{ env.version }}
+          # Share key with the `build-web` job
+          shared-key: web
+          save-if: false
+
       # This is only required in order to have `cross-env` installed, since `npx
       # cross-env` doesn't seem to work in CI (https://github.com/PRQL/prql/pull/3728)
       - run: npm install

.github/workflows/tests.yaml

@@ -76,11 +76,11 @@ jobs:
               - .github/workflows/test-dotnet.yaml
             devcontainer-push:
               - .devcontainer/**/*Dockerfile
-              - Taskfile.yml
+              - Taskfile.yaml
             devcontainer-build:
               - .devcontainer/**/*Dockerfile
               - .github/workflows/build-devcontainer.yaml
-              - Taskfile.yml
+              - Taskfile.yaml
             grammars:
               - grammars/**
             elixir:
@@ -119,7 +119,7 @@ jobs:
               - web/book/**
               - .github/workflows/test-rust.yaml
             taskfile:
-              - Taskfile.yml
+              - Taskfile.yaml
             web:
               - "web/**"
               - ".github/workflows/build-web.yaml"

.mega-linter.yaml

@@ -33,6 +33,8 @@ DISABLE_ERRORS_LINTERS:
   - JSON_JSONLINT
   - MAKEFILE_CHECKMAKE
   - MARKDOWN_MARKDOWN_LINK_CHECK
+  # Prevents us from starting a new library, since it raises an error on unpublished libraries. Can remove after publishing...
+  - REPOSITORY_DUSTILOCK
   - SPELL_MISSPELL
   # Disabled for now, as @max-sixty didn't know whether "Unable to locate the
   # project file. A project file (tsconfig.json or tsconfig.eslint.json) is

.vscode/extensions.json

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    // Keep in sync with Taskfile.yml
+    // Keep in sync with Taskfile.yaml
     "prql-lang.prql-vscode",
     "rust-lang.rust-analyzer",
     "mitsuhiko.insta",

CHANGELOG.md

@@ -18,6 +18,13 @@
 
 **New Contributors**:
 
+## 0.12.2 — 2024-06-10
+
+0.12.2 is a very small release which renames `prql-js` to `prqlc-js` to match
+our standard naming scheme. Within node the package is imported as `prqlc`.
+
+It also fixes a mistake in the `prqlc-python` release pipeline.
+
 ## 0.12.1 — 2024-06-09
 
 0.12.1 is a tiny hotfix release which fixes how intra-prql crate dependencies
@@ -318,7 +325,7 @@ This release has 155 commits from 9 contributors. Selected changes:
 
 - Rename some of the internal crates, and refactored their paths in the repo.
   (@aljazerzen, #3683).
-- Add a `justfile` for developers who prefer that above our `Taskfile.yml`
+- Add a `justfile` for developers who prefer that above our `Taskfile.yaml`
   (@aljazerzen, #3681)
 
 **New Contributors**:

Cargo.toml

@@ -25,7 +25,7 @@ repository = "https://github.com/PRQL/prql"
 # This isn't tested since `cargo-msrv` doesn't support workspaces; instead we
 # test `metadata.msrv` in `prqlc`
 rust-version = "1.70.0"
-version = "0.12.2"
+version = "0.12.3"
 
 [profile.release]
 # Optimize for binary size in releases of all crates,

README.md

@@ -129,7 +129,7 @@ To stay in touch with PRQL:
 - [pyprql Docs](https://pyprql.readthedocs.io) — the pyprql documentation, the
   Python bindings to PRQL, including Jupyter magic.
 - [PRQL VS Code extension](https://marketplace.visualstudio.com/items?itemName=prql-lang.prql-vscode)
-- [prql-js](https://www.npmjs.com/package/prql-js) — JavaScript bindings for
+- [prqlc-js](https://www.npmjs.com/package/prqlc) — JavaScript bindings for
   PRQL.
 
 ## Repo organization

Taskfile.yml → Taskfile.yaml

@@ -384,8 +384,8 @@ tasks:
 # The next two tasks are not used for either:
 #  - the Dockerfile (installing brew takes forever)
 #    so the Dockerfile simply installs hugo & nodejs directly
-#  - the "desktop setup" - it uses other tasks in the Taskfile.yml
-# They remain in the Taskfile.yml as a hint if they should ever be needed
+#  - the "desktop setup" - it uses other tasks in the Taskfile.yaml
+# They remain in the Taskfile.yaml as a hint if they should ever be needed
 
 # install-hugo:
 #   cmds:

lutra/Taskfile.yml → lutra/Taskfile.yaml

@@ -14,7 +14,9 @@ tasks:
       - cmd: cargo run --package lutra -- execute example-project
 
   fmt:
-    desc: Format prqlc source files
+    desc:
+      Format prqlc source files (Duplicates `pre-commit` checks, but some
+      developers prefer to use this directly.)
     cmds:
       - cmd: |
           # remove trailing whitespace

lutra/bindings/python/Taskfile.yaml

@@ -5,6 +5,8 @@ vars:
   venv_dir: "../../../target/venv"
 
 tasks:
+  # (Duplicates `pre-commit` checks, but some developers prefer to use this
+  # directly.)
   fmt:
     desc: "Format"
     cmds:

lutra/lutra/Cargo.toml

@@ -30,7 +30,7 @@ connector_arrow = {version = "0.4.1", features = ["src_sqlite"]}
 env_logger = "0.10.2"
 itertools = {workspace = true}
 log = {workspace = true}
-prqlc = {path = "../../prqlc/prqlc", version = "0.12.2", default-features = false}
+prqlc = {path = "../../prqlc/prqlc", version = "0.12.3", default-features = false}
 rusqlite = {version = "0.31.0", features = ["bundled"]}
 walkdir = "2.5.0"
 

prqlc/Taskfile.yaml

@@ -8,13 +8,13 @@ includes:
 vars:
   packages_core: -p prqlc-ast -p prqlc-parser -p prqlc
   packages_addon: -p prql-compiler-macros -p compile-files
-  packages_bindings: -p prql -p prql-java -p prql-js -p prqlc-c -p prqlc-python
+  packages_bindings: -p prql -p prql-java -p prqlc-js -p prqlc-c -p prqlc-python
 
 tasks:
   fmt:
     desc:
-      Format prqlc source files. Duplicates `pre-commit` checks, but some
-      developers prefer to use this directly.
+      Format prqlc source files. (Duplicates `pre-commit` checks, but some
+      developers prefer to use this directly.)
     cmds:
       - cmd: |
           # remove trailing whitespace

prqlc/bindings/elixir/native/prql/Cargo.toml

@@ -20,5 +20,5 @@ doc = false
 
 # See Readme for details on Mac
 [target.'cfg(not(any(target_family="wasm", target_os = "macos")))'.dependencies]
-prqlc = {path = "../../../../prqlc", default-features = false, version = "0.12.2" }
+prqlc = {path = "../../../../prqlc", default-features = false, version = "0.12.3" }
 rustler = "0.32.1"