Skip to content

Commit d864658

Browse files
authored
V0.1.39 release (#256)
* add duckdb dialect * bump versions for release * disable aarch64 manylinux wheels
1 parent 8146294 commit d864658

File tree

6 files changed

+23
-25
lines changed

6 files changed

+23
-25
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.1.37
2+
current_version = 0.1.39
33
commit = True
44
tag = True
55

.github/workflows/ci.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ jobs:
5757
with:
5858
poetry-version: 1.3.2
5959
- name: Install package deps
60-
run: |
60+
run: |
6161
poetry install
62-
62+
6363
- name: Install rust toolchain
6464
uses: actions-rs/toolchain@v1
6565
with:
@@ -75,13 +75,13 @@ jobs:
7575
shell: bash
7676
env:
7777
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
78-
MACOSX_DEPLOYMENT_TARGET: '10.9'
78+
MACOSX_DEPLOYMENT_TARGET: "10.9"
7979
ARCHFLAGS: -arch x86_64 -arch arm64
8080
PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/3.8/lib
8181
run: poetry run python setup.py bdist_wheel && poetry install
8282

8383
- name: Build Python package
84-
if: matrix.os != 'macos-latest'
84+
if: matrix.os != 'macos-latest'
8585
run: poetry run python setup.py bdist_wheel && poetry install
8686

8787
- name: pytest
@@ -108,13 +108,12 @@ jobs:
108108
fail-fast: false
109109
matrix:
110110
include:
111-
- {tag: manylinux2014, arch: x86_64}
112-
- {tag: manylinux2014, arch: i686}
113-
- {tag: manylinux2014, arch: aarch64}
114-
# TODO: figure out a way to renable this, for now it's far too slow
111+
- { tag: manylinux2014, arch: x86_64 }
112+
- { tag: manylinux2014, arch: i686 }
113+
# TODO: figure out a way to renable these, for now far too slow
115114
# to run in github actions (> 6hrs)
116115
# - {tag: manylinux2014, arch: ppc64le}
117-
116+
# - {tag: manylinux2014, arch: aarch64}
118117
runs-on: ubuntu-latest
119118
needs: lint
120119
steps:
@@ -159,10 +158,9 @@ jobs:
159158
publish:
160159
runs-on: ubuntu-latest
161160
needs: [manylinux-build, native-build, source-build]
162-
steps:
163-
161+
steps:
164162
- uses: actions/download-artifact@v2
165-
with:
163+
with:
166164
name: wheels
167165
path: dist/
168166

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "sqloxide"
3-
version = "0.1.36"
3+
version = "0.1.39"
44
authors = ["Will Eaton <[email protected]>"]
55
edition = "2018"
66

@@ -9,13 +9,13 @@ name = "sqloxide"
99
crate-type = ["cdylib"]
1010

1111
[dependencies]
12-
pythonize = "0.19"
12+
pythonize = "0.20"
1313
serde = "1.0.171"
1414

1515
[dependencies.pyo3]
16-
version = "0.19.1"
16+
version = "0.20.0"
1717
features = ["extension-module"]
1818

1919
[dependencies.sqlparser]
20-
version = "0.36.1"
20+
version = "0.39.0"
2121
features = ["serde", "visitor"]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "sqloxide"
3-
version = "0.1.37"
3+
version = "0.1.39"
44
repository = "https://github.com/wseaton/sqloxide"
55
license = "MIT"
66
description = "Python bindings for sqlparser-rs"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setup_kwargs = {
99
"name": "sqloxide",
10-
"version": "0.1.37",
10+
"version": "0.1.39",
1111
"description": "Python bindings for sqlparser-rs",
1212
"long_description": open("readme.md").read(),
1313
"long_description_content_type": "text/markdown",

src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ fn string_to_dialect(dialect: &str) -> Box<dyn Dialect> {
1818
"ansi" => Box::new(AnsiDialect {}),
1919
"bigquery" | "bq" => Box::new(BigQueryDialect {}),
2020
"clickhouse" => Box::new(ClickHouseDialect {}),
21+
"duckdb" => Box::new(DuckDbDialect {}),
2122
"generic" => Box::new(GenericDialect {}),
2223
"hive" => Box::new(HiveDialect {}),
2324
"ms" | "mssql" => Box::new(MsSqlDialect {}),
@@ -39,6 +40,7 @@ fn string_to_dialect(dialect: &str) -> Box<dyn Dialect> {
3940
/// Available `dialects`:
4041
/// - generic
4142
/// - ansi
43+
/// - duckdb
4244
/// - hive
4345
/// - ms (mssql)
4446
/// - mysql
@@ -56,12 +58,10 @@ fn parse_sql(py: Python, sql: &str, dialect: &str) -> PyResult<PyObject> {
5658
let parse_result = Parser::parse_sql(&*chosen_dialect, sql);
5759

5860
let output = match parse_result {
59-
Ok(statements) => {
60-
pythonize(py, &statements).map_err(|e| {
61-
let msg = e.to_string();
62-
PyValueError::new_err(format!("Python object serialization failed.\n\t{msg}"))
63-
})?
64-
}
61+
Ok(statements) => pythonize(py, &statements).map_err(|e| {
62+
let msg = e.to_string();
63+
PyValueError::new_err(format!("Python object serialization failed.\n\t{msg}"))
64+
})?,
6565
Err(e) => {
6666
let msg = e.to_string();
6767
return Err(PyValueError::new_err(format!(

0 commit comments

Comments
 (0)