forked from pool/python-sqlite-utils
Compare commits
5 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 5d653dad70 | |||
| 62d3d0e135 | |||
| 056b398f67 | |||
| 147acdc3c6 | |||
| 8d020427ed |
@@ -1,3 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 8 05:02:17 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Add patch support-click-8.3.0.patch:
|
||||
* Workaround click 8.3.0 bug.
|
||||
- Correct Requires, it's python-python-dateutil.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 19 12:47:42 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Clean up the SPEC file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 19 11:12:57 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
||||
|
||||
- Update to 3.38
|
||||
* Plugins can now reuse the implementation of the ``sqlite-utils memory``
|
||||
CLI command with the new ``return_db=True`` parameter. (:issue:`643`)
|
||||
* ``table.transform()`` now recreates indexes after transforming a table.
|
||||
A new ``sqlite_utils.db.TransformError`` exception is raised if these
|
||||
indexes cannot be recreated due to conflicting changes to the table
|
||||
such as a column rename. Thanks, Mat Miller. (:issue:`633`)
|
||||
* ``table.search()`` now accepts a ``include_rank=True`` parameter, causing
|
||||
the resulting rows to have a ``rank`` column showing the calculated relevance
|
||||
score. Thanks, `liunux4odoo <https://github.com/liunux4odoo>`__. (`#628`)
|
||||
* Fixed an error that occurred when creating a strict table with at least
|
||||
one floating point column. These ``FLOAT`` columns are now correctly
|
||||
created as ``REAL`` as well, but only for strict tables. (:issue:`644`)
|
||||
- from version 3.37
|
||||
* The ``create-table`` and ``insert-files`` commands all now accept multiple
|
||||
``--pk`` options for compound primary keys. (:issue:`620`)
|
||||
* Now tested against Python 3.13 pre-release. (`#619`)
|
||||
* Fixed a crash that can occur in environments with a broken ``numpy``
|
||||
installation, producing a ``module 'numpy' has no attribute 'int8'``.
|
||||
(:issue:`632`)
|
||||
- Adjust upstream source name in spec file
|
||||
- Use Python 3.11 on SLE-15 by default
|
||||
- Limit Python files matched in %files section
|
||||
- Switch build system from setuptools to pyproject.toml
|
||||
* Add python-pip and python-wheel to BuildRequires
|
||||
* Replace %python_build with %pyproject_wheel
|
||||
* Replace %python_install with %pyproject_install
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 12 08:20:52 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-sqlite-utils
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,31 +16,37 @@
|
||||
#
|
||||
|
||||
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-sqlite-utils
|
||||
Version: 3.36
|
||||
Version: 3.38
|
||||
Release: 0
|
||||
Summary: Python CLI tool and library for manipulating SQLite databases
|
||||
License: Apache-2.0
|
||||
Group: Development/Languages/Python
|
||||
URL: https://github.com/simonw/sqlite-utils
|
||||
Source: https://files.pythonhosted.org/packages/source/s/sqlite-utils/sqlite-utils-%{version}.tar.gz
|
||||
Source: https://files.pythonhosted.org/packages/source/s/sqlite_utils/sqlite_utils-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM gh#simonw/sqlite-utils#665/commits/211831966ed389954f44cb8aa2b842481c374557
|
||||
Patch0: support-click-8.3.0.patch
|
||||
BuildRequires: %{python_module click-default-group}
|
||||
BuildRequires: %{python_module click}
|
||||
BuildRequires: %{python_module hypothesis}
|
||||
BuildRequires: %{python_module pandas}
|
||||
BuildRequires: %{python_module pip}
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: %{python_module sqlite-fts4}
|
||||
BuildRequires: %{python_module tabulate}
|
||||
BuildRequires: %{python_module wheel}
|
||||
BuildRequires: %{pythons}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
Requires: python-click
|
||||
Requires: python-click-default-group
|
||||
Requires: python-pluggy
|
||||
Requires: python-python-dateutil
|
||||
Requires: python-sqlite-fts4
|
||||
Requires: python-tabulate
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun):update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
BuildArch: noarch
|
||||
%python_subpackages
|
||||
|
||||
@@ -48,15 +54,15 @@ BuildArch: noarch
|
||||
CLI tool and Python utility functions for manipulating SQLite databases.
|
||||
|
||||
%prep
|
||||
%setup -q -n sqlite-utils-%{version}
|
||||
%autosetup -p1 -n sqlite_utils-%{version}
|
||||
# https://github.com/simonw/sqlite-utils/issues/357
|
||||
sed -i 's:pytest-runner:pytest:' setup.py
|
||||
|
||||
%build
|
||||
%python_build
|
||||
%pyproject_wheel
|
||||
|
||||
%install
|
||||
%python_install
|
||||
%pyproject_install
|
||||
%python_clone -a %{buildroot}%{_bindir}/sqlite-utils
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitelib}
|
||||
|
||||
@@ -74,6 +80,7 @@ export LANG=en_US.UTF-8
|
||||
%doc README.md docs
|
||||
%license LICENSE
|
||||
%python_alternative %{_bindir}/sqlite-utils
|
||||
%{python_sitelib}/*
|
||||
%{python_sitelib}/sqlite_utils
|
||||
%{python_sitelib}/sqlite_utils-%{version}.dist-info
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dcc311394fe86dc16f65037b0075e238efcfd2e12e65d53ed196954502996f3c
|
||||
size 211586
|
||||
3
sqlite_utils-3.38.tar.gz
Normal file
3
sqlite_utils-3.38.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1ae77b931384052205a15478d429464f6c67a3ac3b4eafd3c674ac900f623aab
|
||||
size 214449
|
||||
78
support-click-8.3.0.patch
Normal file
78
support-click-8.3.0.patch
Normal file
@@ -0,0 +1,78 @@
|
||||
From 211831966ed389954f44cb8aa2b842481c374557 Mon Sep 17 00:00:00 2001
|
||||
From: Simon Willison <swillison@gmail.com>
|
||||
Date: Wed, 1 Oct 2025 13:22:10 -0700
|
||||
Subject: [PATCH] A bunch of fixes for Click sentinal stuff
|
||||
|
||||
---
|
||||
sqlite_utils/cli.py | 31 +++++++++++++++++++++++++------
|
||||
1 file changed, 25 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/sqlite_utils/cli.py b/sqlite_utils/cli.py
|
||||
index 5d3ba05e..6086ba96 100644
|
||||
--- a/sqlite_utils/cli.py
|
||||
+++ b/sqlite_utils/cli.py
|
||||
@@ -952,10 +952,14 @@ def insert_upsert_implementation(
|
||||
functions=None,
|
||||
strict=False,
|
||||
):
|
||||
+ convert = _value_or_none(convert)
|
||||
+ delimiter = _value_or_none(delimiter)
|
||||
+ quotechar = _value_or_none(quotechar)
|
||||
+ encoding = _value_or_none(encoding)
|
||||
+ bulk_sql = _value_or_none(bulk_sql)
|
||||
db = sqlite_utils.Database(path)
|
||||
_load_extensions(db, load_extension)
|
||||
- if functions:
|
||||
- _register_functions(db, functions)
|
||||
+ _maybe_register_functions(db, functions)
|
||||
if (delimiter or quotechar or sniff or no_headers) and not tsv:
|
||||
csv = True
|
||||
if (nl + csv + tsv) >= 2:
|
||||
@@ -1790,8 +1794,7 @@ def query(
|
||||
_load_extensions(db, load_extension)
|
||||
db.register_fts4_bm25()
|
||||
|
||||
- if functions:
|
||||
- _register_functions(db, functions)
|
||||
+ _maybe_register_functions(db, functions)
|
||||
|
||||
_execute_query(
|
||||
db,
|
||||
@@ -1917,6 +1920,9 @@ def memory(
|
||||
\b
|
||||
sqlite-utils memory animals.csv --schema
|
||||
"""
|
||||
+ sql = _value_or_none(sql)
|
||||
+ save = _value_or_none(save)
|
||||
+ encoding = _value_or_none(encoding)
|
||||
db = sqlite_utils.Database(memory=True)
|
||||
|
||||
# If --dump or --save or --analyze used but no paths detected, assume SQL query is a path:
|
||||
@@ -1990,8 +1996,7 @@ def memory(
|
||||
_load_extensions(db, load_extension)
|
||||
db.register_fts4_bm25()
|
||||
|
||||
- if functions:
|
||||
- _register_functions(db, functions)
|
||||
+ _maybe_register_functions(db, functions)
|
||||
|
||||
if return_db:
|
||||
return db
|
||||
@@ -3286,3 +3291,17 @@ def _register_functions(db, functions):
|
||||
for name, value in globals.items():
|
||||
if callable(value) and not name.startswith("_"):
|
||||
db.register_function(value, name=name)
|
||||
+
|
||||
+
|
||||
+def _value_or_none(value):
|
||||
+ if getattr(value, "__class__", None).__name__ == "Sentinel":
|
||||
+ return None
|
||||
+ return value
|
||||
+
|
||||
+
|
||||
+def _maybe_register_functions(db, functions):
|
||||
+ functions = _value_or_none(functions)
|
||||
+ if isinstance(functions, (bytes, bytearray)):
|
||||
+ functions = functions.decode("utf-8")
|
||||
+ if isinstance(functions, str) and functions.strip():
|
||||
+ _register_functions(db, functions)
|
||||
Reference in New Issue
Block a user