querysource 4.1.4__tar.gz → 4.1.6__tar.gz

{querysource-4.1.4 → querysource-4.1.6}/.github/workflows/release.yml

@@ -23,16 +23,12 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
       - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Add Rust to PATH
         run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
@@ -45,15 +41,17 @@ jobs:
       - name: Build wheels
         env:
           CIBW_ARCHS: x86_64
-          # Install Rust and build qs_parsers Rust sub-package inside the manylinux container
+          # Install Rust, build _qs_parsers, and copy the .so into the querysource package tree
           CIBW_BEFORE_BUILD: >-
             curl https://sh.rustup.rs -sSf | sh -s -- -y &&
             export PATH=/root/.cargo/bin:$PATH &&
             pip install maturin &&
-            cd rust && rm -rf target/wheels && maturin build --release --interpreter python3 && pip install target/wheels/*.whl && cd ..
-          # Make sure Rust tools are on the PATH for the Cython build
+            cd {project}/rust && rm -rf target/wheels &&
+            maturin build --release --interpreter python3 &&
+            pip install target/wheels/*.whl &&
+            python3 -c "import _qs_parsers, shutil; shutil.copy(_qs_parsers.__file__, '{project}/querysource/qs_parsers/')" &&
+            cd {project}
           CIBW_ENVIRONMENT: "PATH=/root/.cargo/bin:$PATH"
-          RUST_SUBPACKAGE_PATH: rust
           CIBW_BUILD: ${{ matrix.cibw-build }}
         run: |
           cibuildwheel --platform linux --output-dir dist

{querysource-4.1.4 → querysource-4.1.6}/MANIFEST.in

@@ -14,15 +14,23 @@ graft tests
 # Global excludes
 global-exclude *.pyc
 global-exclude __pycache__
-global-exclude *.so
 global-exclude *.o
 global-exclude .git*
 global-exclude .DS_Store
 global-exclude .venv
+# Exclude Cython-generated .so files (they are compiled during wheel build)
+# but keep Rust extension .so files bundled in qs_parsers
+recursive-exclude querysource/parsers *.so
+recursive-exclude querysource/types *.so
+recursive-exclude querysource/utils *.so
 prune docs
 prune samples
 prune examples
 prune settings
 prune plugins/*
+prune sdd
+prune my_prompts
+prune lab
+prune rust/target
 recursive-exclude */__pycache__
 prune */__pycache__

{querysource-4.1.4 → querysource-4.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querysource
-Version: 4.1.4
+Version: 4.1.6
 Summary: Aiohttp web service for querying several databases easily
 Author-email: Jesus Lara <jesuslarag@gmail.com>
 License: BSD-3-Clause
@@ -42,7 +42,7 @@ Requires-Dist: lxml>=5.3.0
 Requires-Dist: xlsxwriter==3.2.0
 Requires-Dist: odswriter==0.4.0
 Requires-Dist: odfpy==1.4.1
-Requires-Dist: xlrd==2.0.1
+Requires-Dist: xlrd==2.0.2
 Requires-Dist: reportlab==4.1.0
 Requires-Dist: APScheduler<3.12.0,>=3.11.0
 Requires-Dist: bs4==0.0.2

{querysource-4.1.4 → querysource-4.1.6}/pyproject.toml

@@ -52,7 +52,7 @@ dependencies = [
     "xlsxwriter==3.2.0",
     "odswriter==0.4.0",
     "odfpy==1.4.1",
-    "xlrd==2.0.1",
+    "xlrd==2.0.2",
     "reportlab==4.1.0",
     "APScheduler>=3.11.0,<3.12.0",
     "bs4==0.0.2",
@@ -160,25 +160,11 @@ write_to = "querysource/_version.py"
 version = {attr = "querysource.__version__"}
 
 [tool.setuptools.packages.find]
-exclude = [
-    "contrib",
-    "google",
-    "docs",
-    "plugins",
-    "lab",
-    "examples",
-    "samples",
-    "settings",
-    "etc",
-    "bin",
-    "build",
-    "dist",
-    "tests",
-    "env",
-]
+include = ["querysource", "querysource.*"]
 
 [tool.setuptools.package-data]
 querysource = ["py.typed"]
+"querysource.qs_parsers" = ["*.so", "*.pyd"]
 
 [tool.pytest.ini_options]
 addopts = [
@@ -189,3 +175,12 @@ filterwarnings = [
     "error",
     'ignore:The loop argument is deprecated since Python 3\.8, and scheduled for removal in Python 3\.10:DeprecationWarning:asyncio',
 ]
+
+# ---------------------------------------------------------------------------
+# Maturin (Rust extension) — used by `maturin develop` for local builds
+# ---------------------------------------------------------------------------
+[tool.maturin]
+manifest-path = "rust/Cargo.toml"
+module-name = "querysource.qs_parsers._qs_parsers"
+bindings = "pyo3"
+features = ["pyo3/extension-module"]

{querysource-4.1.4 → querysource-4.1.6}/querysource/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '4.1.5.dev0+g509d7ffe7.d20260413'
-__version_tuple__ = version_tuple = (4, 1, 5, 'dev0', 'g509d7ffe7.d20260413')
+__version__ = version = '4.1.7.dev0+gb8ef29720.d20260414'
+__version_tuple__ = version_tuple = (4, 1, 7, 'dev0', 'gb8ef29720.d20260414')
 
-__commit_id__ = commit_id = 'g509d7ffe7'
+__commit_id__ = commit_id = 'gb8ef29720'