From 1d3afe5b17bf9d5ceacf9103d95234199a5e0976 Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:18:31 -0400 Subject: [PATCH 01/15] bump version to v0.1.47; upgrade sqlparser-rs --- Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 82cdd95..f764157 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sqloxide" -version = "0.1.43" +version = "0.1.47" authors = ["Will Eaton "] edition = "2018" @@ -9,13 +9,13 @@ name = "sqloxide" crate-type = ["cdylib"] [dependencies] -pythonize = "0.20" +pythonize = "0.21.1" serde = "1.0.171" [dependencies.pyo3] -version = "0.20.0" +version = "0.21.2" features = ["extension-module"] [dependencies.sqlparser] -version = "0.43.1" +version = "0.47.0" features = ["serde", "visitor"] From 6174678c92a201e5d89fdb82676b832965e4ada1 Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:19:48 -0400 Subject: [PATCH 02/15] bump versions to 0.1.47 --- .bumpversion.cfg | 2 +- pyproject.toml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 772b71a..24c4e51 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.43 +current_version = 0.1.47 commit = True tag = True diff --git a/pyproject.toml b/pyproject.toml index 0c0c844..b2ef12d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "sqloxide" -version = "0.1.43" +version = "0.1.47" repository = "https://github.com/wseaton/sqloxide" license = "MIT" description = "Python bindings for sqlparser-rs" diff --git a/setup.py b/setup.py index c74eab7..c249461 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup_kwargs = { "name": "sqloxide", - "version": "0.1.43", + "version": "0.1.47", "description": "Python bindings for sqlparser-rs", "long_description": open("readme.md").read(), "long_description_content_type": "text/markdown", From e94325f41e2a7c78d7371abd177129a9a610015f Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:25:53 -0400 Subject: [PATCH 03/15] stop supporting python 3.7 --- .github/workflows/ci.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4b8e11..5e50881 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index c249461..2d34f41 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ "url": "https://github.com/wseaton/sqloxide", "packages": packages, "package_data": package_data, - "python_requires": ">=3.7,<4.0", + "python_requires": ">=3.8,<4.0", } from build import * From 7ea923609540d085a7ac7bcb98ba8b1b29077de1 Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:39:17 -0400 Subject: [PATCH 04/15] add back python3.7 support; ci tweaks --- .github/workflows/ci.yml | 7 +++---- setup.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e50881..4d8ef73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 @@ -71,13 +71,12 @@ jobs: run: rustup target add aarch64-apple-darwin - name: Build on macOS universal2 - if: matrix.os == 'macos-latest' shell: bash env: DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer - MACOSX_DEPLOYMENT_TARGET: "10.9" + MACOSX_DEPLOYMENT_TARGET: "10.15" ARCHFLAGS: -arch x86_64 -arch arm64 - PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/3.8/lib + PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/${{ matrix.python-version }}/lib run: poetry run python setup.py bdist_wheel && poetry install - name: Build Python package diff --git a/setup.py b/setup.py index 2d34f41..c249461 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ "url": "https://github.com/wseaton/sqloxide", "packages": packages, "package_data": package_data, - "python_requires": ">=3.8,<4.0", + "python_requires": ">=3.7,<4.0", } from build import * From 63f34261a696a4364004f9461d99ea3ddf0f3337 Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:42:58 -0400 Subject: [PATCH 05/15] fixup --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d8ef73..e0bf6b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,6 +71,7 @@ jobs: run: rustup target add aarch64-apple-darwin - name: Build on macOS universal2 + if: matrix.os == 'macos-latest' shell: bash env: DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer From c94537bcf33b8681d2090b209718d998421207b7 Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:44:01 -0400 Subject: [PATCH 06/15] downgrade py03 and pythonize --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f764157..da02066 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,11 +9,11 @@ name = "sqloxide" crate-type = ["cdylib"] [dependencies] -pythonize = "0.21.1" +pythonize = "0.20" serde = "1.0.171" [dependencies.pyo3] -version = "0.21.2" +version = "0.20" features = ["extension-module"] [dependencies.sqlparser] From 89a5d01f1353e3838b51d79ccb66ae972c10b69e Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 11:44:21 -0400 Subject: [PATCH 07/15] redrop 3.7 --- .github/workflows/ci.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e0bf6b6..2e72f7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index c249461..2d34f41 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ "url": "https://github.com/wseaton/sqloxide", "packages": packages, "package_data": package_data, - "python_requires": ">=3.7,<4.0", + "python_requires": ">=3.8,<4.0", } from build import * From 905f545f6a6bf86931ae60eb23da5bdbc0665109 Mon Sep 17 00:00:00 2001 From: Will Eaton Date: Tue, 18 Jun 2024 12:38:00 -0400 Subject: [PATCH 08/15] try .0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index da02066..580f15d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ pythonize = "0.20" serde = "1.0.171" [dependencies.pyo3] -version = "0.20" +version = "0.20.0" features = ["extension-module"] [dependencies.sqlparser] From 5a1c7f2e08c3fe25fdb357b3a65d3d8610e86db7 Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 14:29:57 +0300 Subject: [PATCH 09/15] test --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 580f15d..8cf7c38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ pythonize = "0.20" serde = "1.0.171" [dependencies.pyo3] -version = "0.20.0" +version = "0.22.0" features = ["extension-module"] [dependencies.sqlparser] From b7d2b5d3c29cf0086f98b3aca6ed4bef50b152d7 Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 14:31:57 +0300 Subject: [PATCH 10/15] test --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8cf7c38..f764157 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,11 +9,11 @@ name = "sqloxide" crate-type = ["cdylib"] [dependencies] -pythonize = "0.20" +pythonize = "0.21.1" serde = "1.0.171" [dependencies.pyo3] -version = "0.22.0" +version = "0.21.2" features = ["extension-module"] [dependencies.sqlparser] From 2434c2ee1f38a2b1abef80ce339fca0804463c91 Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 15:10:01 +0300 Subject: [PATCH 11/15] test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e72f7c..893b261 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Run image From 9483887d6fe68919feeca00c908693324ed0d6b7 Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 15:17:56 +0300 Subject: [PATCH 12/15] test --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 893b261..dd2183e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: fail-fast: false matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v5 @@ -74,10 +74,11 @@ jobs: if: matrix.os == 'macos-latest' shell: bash env: - DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer + # DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer MACOSX_DEPLOYMENT_TARGET: "10.15" ARCHFLAGS: -arch x86_64 -arch arm64 - PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/${{ matrix.python-version }}/lib + # PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/${{ matrix.python-version }}/lib + PYO3_CROSS_PYTHON_VERSION: ${{ matrix.python-version }} run: poetry run python setup.py bdist_wheel && poetry install - name: Build Python package From 09e8dd316edab4458dcfa75ca552c8e51ca54a5a Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 15:20:59 +0300 Subject: [PATCH 13/15] test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd2183e..8627f52 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: if: matrix.os == 'macos-latest' shell: bash env: - # DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer MACOSX_DEPLOYMENT_TARGET: "10.15" ARCHFLAGS: -arch x86_64 -arch arm64 # PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/${{ matrix.python-version }}/lib From 996705254f812cbb5e5fe34ad3344568eb1e31eb Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 15:34:08 +0300 Subject: [PATCH 14/15] test --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8627f52..92c82f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,10 @@ jobs: if: matrix.os == 'macos-latest' run: rustup target add aarch64-apple-darwin + - name: Install Rust x86_64-apple-darwin + if: matrix.os == 'macos-latest' + run: rustup target add x86_64-apple-darwin + - name: Build on macOS universal2 if: matrix.os == 'macos-latest' shell: bash From d5ce51c67799ad39babb3a70f2f9ec40fcf21ab6 Mon Sep 17 00:00:00 2001 From: Yuval Shkolar Date: Thu, 27 Jun 2024 15:40:48 +0300 Subject: [PATCH 15/15] test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92c82f9..d2b35fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: fail-fast: false matrix: python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - os: [macos-latest] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v5