Skip to content

Commit

Permalink
build: Make packages releasable (#3065)
Browse files Browse the repository at this point in the history
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
max-sixty and pre-commit-ci[bot] authored Jul 25, 2023
1 parent 617fa99 commit 04b5174
Show file tree
Hide file tree
Showing 199 changed files with 56 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/.codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ comment: false

ignore:
# Contains code for integration tests which don't run in coverage
- "crates/prql_compiler/tests/integration/**"
- "crates/prql-compiler/tests/integration/**"

coverage:
status:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-all.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
# https://github.com/foresterre/cargo-msrv/issues/590
- name: Verify minimum rust version — prql-compiler
# Ideally we'd check all crates, ref https://github.com/foresterre/cargo-msrv/issues/295
working-directory: crates/prql_compiler
working-directory: crates/prql-compiler
run: cargo msrv verify
- name: Verify minimum rust version — prqlc
working-directory: crates/prqlc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
}}
- name: Run docker compose
run: docker compose up -d
working-directory: ./crates/prql_compiler/tests/integration
working-directory: ./crates/prql-compiler/tests/integration
if: ${{ inputs.target == 'x86_64-unknown-linux-gnu' }}
- name: Wait for database
uses: ifaxity/wait-on-action@v1
Expand Down
42 changes: 21 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
[workspace]
members = [
"crates/*",

# Bindings
"crates/*", # Bindings
"bindings/prql-elixir/native/prql",
"bindings/prql-java",
"bindings/prql-js",
"bindings/prql-lib",
"bindings/prql-python", #
# The book / docs
"web/book", #
# An example
"crates/prql_compiler/examples/compile-files", #
"bindings/prql-python",
"web/book", # The book / docs
"crates/prql-compiler/examples/compile-files", # An example
]
resolver = "2"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ To stay in touch with PRQL:

This repo is composed of:

- **[prql-compiler](./crates/prql_compiler/)** — the compiler, written in rust,
- **[prql-compiler](./crates/prql-compiler/)** — the compiler, written in rust,
whose main role is to compile PRQL into SQL. It also includes
[prqlc](./crates/prqlc/), the CLI.
- **[web](./web/)** — our web content: the [Book][prql book],
Expand Down
2 changes: 1 addition & 1 deletion _typos.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[files]
extend-exclude = [
"web/book/theme/highlight.js",
"crates/prql_compiler/tests/integration/data/",
"crates/prql-compiler/tests/integration/data/",
"web/website/themes/prql-theme/static/plugins/bootstrap",
"web/website/themes/prql-theme/static/plugins/highlight/highlight.min.js",
]
Expand Down
2 changes: 1 addition & 1 deletion bindings/prql-elixir/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ index 7194ca4f..9c7240ff 100644
--- a/bindings/prql-elixir/native/prql/Cargo.toml
+++ b/bindings/prql-elixir/native/prql/Cargo.toml
@@ -19,5 +19,5 @@ path = "src/lib.rs"
prql-compiler = {path = "../../../../crates/prql_compiler", default-features = false, version = "0.6.1"}
prql-compiler = {path = "../../../../crates/prql-compiler", default-features = false, version = "0.6.1"}

# See Readme for details on Mac
-[target.'cfg(not(any(target_family="wasm", target_os = "macos")))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion bindings/prql-elixir/native/prql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ test = false

# See Readme for details on Mac
[target.'cfg(not(any(target_family="wasm", target_os = "macos", tarpaulin)))'.dependencies]
prql-compiler = {path = "../../../../crates/prql_compiler", default-features = false, version = "0.9.1" }
prql-compiler = {path = "../../../../crates/prql-compiler", default-features = false, version = "0.9.1"}
rustler = "0.29.0"
2 changes: 1 addition & 1 deletion bindings/prql-java/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test = false

[dependencies]
jni = "0.21.1"
prql-compiler = {path = "../../crates/prql_compiler", default-features = false}
prql-compiler = {path = "../../crates/prql-compiler", default-features = false}

[package.metadata.release]
tag-name = "{{version}}"
Expand Down
2 changes: 1 addition & 1 deletion bindings/prql-js/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test = false
default = ["console_error_panic_hook"]

[dependencies]
prql-compiler = {path = "../../crates/prql_compiler", default-features = false}
prql-compiler = {path = "../../crates/prql-compiler", default-features = false}
wasm-bindgen = "0.2.87"

# The `console_error_panic_hook` crate provides better debugging of panics by
Expand Down
2 changes: 1 addition & 1 deletion bindings/prql-lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test = false

[dependencies]
libc = "0.2"
prql-compiler = {path = "../../crates/prql_compiler", default-features = false}
prql-compiler = {path = "../../crates/prql-compiler", default-features = false}
serde_json = "1.0"

[package.metadata.release]
Expand Down
2 changes: 1 addition & 1 deletion bindings/prql-python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name = "prql_python"
pyo3 = {version = "0.19.0", features = ["abi3-py37"]}

[dependencies]
prql-compiler = {path = "../../crates/prql_compiler", default-features = false}
prql-compiler = {path = "../../crates/prql-compiler", default-features = false}

[dev-dependencies]
insta = {version = "1.31", features = ["colors", "glob", "yaml"]}
Expand Down
3 changes: 2 additions & 1 deletion crates/prql_ast/Cargo.toml → crates/prql-ast/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
name = "prql_ast"
description = "The AST for the PRQL language."
name = "prql-ast"

edition.workspace = true
license.workspace = true
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ proc_macro = true
test = false

[dependencies]
prql-compiler = {path = "../prql_compiler", default-features = false, version = "0.9.1" }
prql-compiler = {path = "../prql-compiler", default-features = false, version = "0.9.1"}
syn = "2.0.2"

[package.metadata.release]
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ test-dbs = ["duckdb", "rusqlite", "tokio"]
test-dbs-external = ["chrono", "duckdb", "mysql", "pg_bigdecimal", "postgres", "rusqlite", "tiberius", "tokio", "tokio-util"]

[dependencies]
prql_ast = {path = "../prql_ast"}
prql_parser = {path = "../prql_parser"}
prql-ast = {path = "../prql-ast", version = '0.9.1'}
prql-parser = {path = "../prql-parser", version = '0.9.1'}

anstream = {version = "0.3.2", features = ["auto"]}
anyhow = {version = "1.0.57", features = ["backtrace"]}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[package]
name = "prql_parser"
description = "A parser for the PRQL query language."
name = "prql-parser"

edition.workspace = true
license.workspace = true
Expand All @@ -9,7 +10,7 @@ version.workspace = true

[dependencies]
itertools = "0.11.0"
prql_ast = {path = "../prql_ast"}
prql-ast = {path = "../prql-ast", version = '0.9.1'}
semver = {version = "1.0.14"}

# Chumsky's default features have issues when running in wasm (though we only
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions crates/prqlc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ colorchoice-clap = "1.0.0"
env_logger = {version = "0.10.0", features = ["color"]}
itertools = "0.11.0"
notify = "^6.0.0"
prql-compiler = {path = '../prql_compiler', features = ["serde_yaml"]}
prql_ast = {path = '../prql_ast'}
prql-ast = {path = '../prql-ast', version = '0.9.1'}
prql-compiler = {path = '../prql-compiler', features = ["serde_yaml"], version = '0.9.1'}
regex = {version = "1.9.0", features = ["std", "unicode"]}
serde = "^1"
serde_json = "1.0.81"
Expand Down
8 changes: 4 additions & 4 deletions crates/tests_misc/tests/ast_code_matches.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ fn test_expr_ast_code_matches() {
// This test exists to ensure that the doc comments of the shared fields/variants stay in sync.
assert_snapshot!(
diff_code_after_start(
&read_to_string("../../crates/prql_ast/src/expr.rs").unwrap(),
&read_to_string("../../crates/prql_compiler/src/ir/pl/expr.rs").unwrap(),
&read_to_string("../../crates/prql-ast/src/expr.rs").unwrap(),
&read_to_string("../../crates/prql-compiler/src/ir/pl/expr.rs").unwrap(),
), @r###"
@@ .. @@
- pub return_ty: Option<Box<Expr>>,
Expand All @@ -29,8 +29,8 @@ fn test_stmt_ast_code_matches() {
// This test exists to ensure that the doc comments of the shared fields/variants stay in sync.
assert_snapshot!(
diff_code_after_start(
&read_to_string("../../crates/prql_ast/src/stmt.rs").unwrap(),
&read_to_string("../../crates/prql_compiler/src/ir/pl/stmt.rs").unwrap(),
&read_to_string("../../crates/prql-ast/src/stmt.rs").unwrap(),
&read_to_string("../../crates/prql-compiler/src/ir/pl/stmt.rs").unwrap(),
), @r###"
@@ .. @@
- Main(Box<Expr>),
Expand Down
2 changes: 1 addition & 1 deletion web/book/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ anyhow = "1.0.57"
itertools = "0.11.0"
mdbook = {version = "0.4.21", default-features = false}
mdbook-preprocessor-boilerplate = "0.1.2"
prql-compiler = {path = "../../crates/prql_compiler", default-features = false}
prql-compiler = {path = "../../crates/prql-compiler", default-features = false}
pulldown-cmark = "0.9.1"
pulldown-cmark-to-cmark = "10.0.1"
semver = "1.0.9"
Expand Down
6 changes: 3 additions & 3 deletions web/book/src/reference/stdlib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ standard library. If we find ourselves using them for something frequently,
raise an issue and we'll add it to the stdlib.

Here's the source of the current
[PRQL `std`](https://github.com/PRQL/prql/blob/main/crates/prql_compiler/src/semantic/std.prql):
[PRQL `std`](https://github.com/PRQL/prql/blob/main/crates/prql-compiler/src/semantic/std.prql):

```admonish note
PRQL 0.9.0 has started supporting different DB implementations for standard library functions.
The source is the [`std.sql`](https://github.com/PRQL/prql/blob/main/crates/prql_compiler/src/sql/std.sql.prql).
The source is the [`std.sql`](https://github.com/PRQL/prql/blob/main/crates/prql-compiler/src/sql/std.sql.prql).
```

```prql no-eval
{{#include ../../../../../crates/prql_compiler/src/semantic/std.prql}}
{{#include ../../../../../crates/prql-compiler/src/semantic/std.prql}}
```

And a couple of examples:
Expand Down
2 changes: 1 addition & 1 deletion web/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"private": true,
"scripts": {
"build": "react-scripts build",
"prepare": "rsync -ai --checksum --delete ../../crates/prql_compiler/tests/integration/data/ public/data/ && node generateBook.js",
"prepare": "rsync -ai --checksum --delete ../../crates/prql-compiler/tests/integration/data/ public/data/ && node generateBook.js",
"start": "react-scripts start",
"test": "react-scripts test"
},
Expand Down
2 changes: 1 addition & 1 deletion web/website/content/roadmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ will be tools that engineers use to build data pipelines, like
#### Standard library

Currently, the standard library is
[quite limited](https://github.com/PRQL/prql/blob/main/crates/prql_compiler/src/semantic/std.prql).
[quite limited](https://github.com/PRQL/prql/blob/main/crates/prql-compiler/src/semantic/std.prql).
It contains only basic arithmetic functions (`AVERAGE`, `SUM`) and lacks
functions for string manipulation, date handling and many math functions. We're
looking to gradually introduce these as needed, and reduce the need for
Expand Down

0 comments on commit 04b5174

Please sign in to comment.