From e33ea91b067e28ef0256fa52c03ff46658d9f0ef Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Sat, 15 Oct 2022 19:04:33 +0200 Subject: [PATCH 1/5] Updates Cargo.toml for publishing to crates.io --- Cargo.toml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index a9a0929..8c686d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,16 @@ [package] +name = "prql-query" description = "pq: query and transform data with PRQL" -name = "pq" +repository = "https://github.com/snth/prql-query" +license = "Apache-2.0 OR MIT" edition = "2021" +rust-version = "1.64.0" version = "0.0.6" +[[bin]] +name = "pq" +path = "src/main.rs" + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] From 5a3444c6d17b72058b648f4c4ae42e3c588cf884 Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Mon, 17 Oct 2022 08:59:05 +0200 Subject: [PATCH 2/5] Updates links to point at new repo location --- CHANGELOG.md | 5 +++-- Cargo.toml | 4 ++-- README.md | 18 +++++++++--------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03d4705..1585de4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # pq Changelog -## 0.0.6 - 2022-10-15 +## 0.0.6 - 2022-10-17 -* Updtate to prql-compiler version 0.2.9 +* Updated repo links to point to prql organisation. +* Updtated to prql-compiler version 0.2.9 ## 0.0.5 - 2022-10-13 diff --git a/Cargo.toml b/Cargo.toml index 8c686d4..526e109 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "prql-query" description = "pq: query and transform data with PRQL" -repository = "https://github.com/snth/prql-query" -license = "Apache-2.0 OR MIT" +repository = "https://github.com/prql/prql-query" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.64.0" version = "0.0.6" diff --git a/README.md b/README.md index a90ab8e..ff1415b 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # prql-query (pq) -[![license](http://img.shields.io/badge/license-Apache%20v2-blue.svg)](https://raw.githubusercontent.com/snth/prql-query/main/LICENSE-APACHE) -[![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/snth/prql-query/main/LICENSE-MIT) -[![license](http://img.shields.io/badge/license-UNLICENSE-blue.svg)](https://raw.githubusercontent.com/snth/main/prql-query/master/UNLICENSE) +[![license](http://img.shields.io/badge/license-Apache%20v2-blue.svg)](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-APACHE) +[![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-MIT) +[![license](http://img.shields.io/badge/license-UNLICENSE-blue.svg)](https://raw.githubusercontent.com/prql/main/prql-query/master/UNLICENSE) ## Query and transform data with PRQL @@ -16,8 +16,8 @@ DataFusion](https://arrow.apache.org/datafusion/) and ™)! Licensed under -[Apache](https://raw.githubusercontent.com/snth/prql-query/main/LICENSE-APACHE), -[MIT](https://raw.githubusercontent.com/snth/prql-query/main/LICENSE-MIT) or the +[Apache](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-APACHE), +[MIT](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-MIT) or the [UNLICENSE](https://unlicense.org). ## Examples @@ -53,12 +53,12 @@ Licensed under ### Download a binary from Github Release Binaries are built for Windows, macOS and Linux for every release and can be -dowloaded from [Releases](https://github.com/snth/prql-query/releases/) -([latest](https://github.com/snth/prql-query/releases/latest)). +dowloaded from [Releases](https://github.com/prql/prql-query/releases/) +([latest](https://github.com/prql/prql-query/releases/latest)). ### Run as a container image (Docker) - git clone https://github.com/snth/prql-query.git + git clone https://github.com/prql/prql-query.git cd prql-query docker build -t pq . alias pq="docker run --rm -it -v $(pwd):/data -w /data -u $(id -u):$(id -g) pq" @@ -66,7 +66,7 @@ dowloaded from [Releases](https://github.com/snth/prql-query/releases/) ### Via Rust toolchain (Cargo) - git clone https://github.com/snth/prql-query.git + git clone https://github.com/prql/prql-query.git cd prql-query cargo install --path . From a62b4a9abb030072e1c2ff3fa931870233274aa6 Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Mon, 17 Oct 2022 09:01:22 +0200 Subject: [PATCH 3/5] Removes UNLICENSE --- CHANGELOG.md | 5 +++-- README.md | 6 ++---- UNLICENSE | 24 ------------------------ 3 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 UNLICENSE diff --git a/CHANGELOG.md b/CHANGELOG.md index 1585de4..c4f5919 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,15 @@ ## 0.0.6 - 2022-10-17 * Updated repo links to point to prql organisation. -* Updtated to prql-compiler version 0.2.9 +* Updated to prql-compiler version 0.2.9 +* Removed UNLICENSE. ## 0.0.5 - 2022-10-13 * Added support for querying PostgreSQL databases (through DuckDB). * Added support for querying Sqlite databases (through DuckDB). * Added support for querying DuckDB databases. -* Added UNLICENSED. +* Added UNLICENSE. ## 0.0.4 - 2022-10-13 diff --git a/README.md b/README.md index ff1415b..0fec0de 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![license](http://img.shields.io/badge/license-Apache%20v2-blue.svg)](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-APACHE) [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-MIT) -[![license](http://img.shields.io/badge/license-UNLICENSE-blue.svg)](https://raw.githubusercontent.com/prql/main/prql-query/master/UNLICENSE) ## Query and transform data with PRQL @@ -16,9 +15,8 @@ DataFusion](https://arrow.apache.org/datafusion/) and ™)! Licensed under -[Apache](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-APACHE), -[MIT](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-MIT) or the -[UNLICENSE](https://unlicense.org). +[Apache](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-APACHE) or +[MIT](https://raw.githubusercontent.com/prql/prql-query/main/LICENSE-MIT). ## Examples diff --git a/UNLICENSE b/UNLICENSE deleted file mode 100644 index 68a49da..0000000 --- a/UNLICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to From c5e398d9167894aadc75f753b37cb0d402c6bb7c Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Mon, 17 Oct 2022 09:06:49 +0200 Subject: [PATCH 4/5] Adds publish-to-crates-io action --- .github/workflows/release.yaml | 15 +++++++++++++-- README.md | 4 +--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4a54c74..fe4bb2a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ on: - v[0-9]+.* jobs: - create-release: + create-gh-release: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -23,7 +23,7 @@ jobs: # (Required) GitHub token for creating GitHub Releases. token: ${{ secrets.GITHUB_TOKEN }} - upload-assets: + upload-gh-assets: strategy: matrix: os: @@ -48,3 +48,14 @@ jobs: zip: windows # (required) GitHub token for uploading assets to GitHub Releases. token: ${{ secrets.GITHUB_TOKEN }} + + publish-to-crates-io: + runs-on: ubuntu-latest + steps: + - name: 📂 Checkout code + uses: actions/checkout@v3 + - uses: actions-rs/cargo@v1 + with: + command: publish + env: + CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} diff --git a/README.md b/README.md index 0fec0de..6a3f328 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,7 @@ dowloaded from [Releases](https://github.com/prql/prql-query/releases/) ### Via Rust toolchain (Cargo) - git clone https://github.com/prql/prql-query.git - cd prql-query - cargo install --path . + cargo install prql-query ## Usage From 6d449818ac4cd4e7ddc7a8278ff683b14961bdcc Mon Sep 17 00:00:00 2001 From: Tobias Brandt Date: Mon, 17 Oct 2022 09:18:42 +0200 Subject: [PATCH 5/5] Bumps version to 0.0.7 since 0.0.6 is already on crates.io --- CHANGELOG.md | 7 +++++-- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4f5919..910554e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,14 @@ # pq Changelog -## 0.0.6 - 2022-10-17 +## 0.0.7 - 2022-10-17 * Updated repo links to point to prql organisation. -* Updated to prql-compiler version 0.2.9 * Removed UNLICENSE. +## 0.0.6 - 2022-10-15 + +* Updated to prql-compiler version 0.2.9 + ## 0.0.5 - 2022-10-13 * Added support for querying PostgreSQL databases (through DuckDB). diff --git a/Cargo.toml b/Cargo.toml index 526e109..ed2d638 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/prql/prql-query" license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.64.0" -version = "0.0.6" +version = "0.0.7" [[bin]] name = "pq"