From a50b2ab6af4c4e06475536d383270a9b9b23c2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= Date: Sun, 2 Mar 2025 10:57:52 +0100 Subject: [PATCH 1/2] add patch for sql dqs=off --- recipe/0000-sql-dqs-off.patch | 78 +++++++++++++++++++++++++++++++++++ recipe/meta.yaml | 4 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 recipe/0000-sql-dqs-off.patch diff --git a/recipe/0000-sql-dqs-off.patch b/recipe/0000-sql-dqs-off.patch new file mode 100644 index 0000000..990af3f --- /dev/null +++ b/recipe/0000-sql-dqs-off.patch @@ -0,0 +1,78 @@ +diff --git a/diskcache/core.py b/diskcache/core.py +index 7a3d23b..993b66c 100644 +--- a/diskcache/core.py ++++ b/diskcache/core.py +@@ -542,39 +542,39 @@ def __init__(self, directory=None, timeout=60, disk=Disk, **settings): + # Use triggers to keep Metadata updated. + + sql( +- 'CREATE TRIGGER IF NOT EXISTS Settings_count_insert' +- ' AFTER INSERT ON Cache FOR EACH ROW BEGIN' +- ' UPDATE Settings SET value = value + 1' +- ' WHERE key = "count"; END' ++ "CREATE TRIGGER IF NOT EXISTS Settings_count_insert" ++ " AFTER INSERT ON Cache FOR EACH ROW BEGIN" ++ " UPDATE Settings SET value = value + 1" ++ " WHERE key = 'count'; END" + ) + + sql( +- 'CREATE TRIGGER IF NOT EXISTS Settings_count_delete' +- ' AFTER DELETE ON Cache FOR EACH ROW BEGIN' +- ' UPDATE Settings SET value = value - 1' +- ' WHERE key = "count"; END' ++ "CREATE TRIGGER IF NOT EXISTS Settings_count_delete" ++ " AFTER DELETE ON Cache FOR EACH ROW BEGIN" ++ " UPDATE Settings SET value = value - 1" ++ " WHERE key = 'count'; END" + ) + + sql( +- 'CREATE TRIGGER IF NOT EXISTS Settings_size_insert' +- ' AFTER INSERT ON Cache FOR EACH ROW BEGIN' +- ' UPDATE Settings SET value = value + NEW.size' +- ' WHERE key = "size"; END' ++ "CREATE TRIGGER IF NOT EXISTS Settings_size_insert" ++ " AFTER INSERT ON Cache FOR EACH ROW BEGIN" ++ " UPDATE Settings SET value = value + NEW.size" ++ " WHERE key = 'size'; END" + ) + + sql( +- 'CREATE TRIGGER IF NOT EXISTS Settings_size_update' +- ' AFTER UPDATE ON Cache FOR EACH ROW BEGIN' +- ' UPDATE Settings' +- ' SET value = value + NEW.size - OLD.size' +- ' WHERE key = "size"; END' ++ "CREATE TRIGGER IF NOT EXISTS Settings_size_update" ++ " AFTER UPDATE ON Cache FOR EACH ROW BEGIN" ++ " UPDATE Settings" ++ " SET value = value + NEW.size - OLD.size" ++ " WHERE key = 'size'; END" + ) + + sql( +- 'CREATE TRIGGER IF NOT EXISTS Settings_size_delete' +- ' AFTER DELETE ON Cache FOR EACH ROW BEGIN' +- ' UPDATE Settings SET value = value - OLD.size' +- ' WHERE key = "size"; END' ++ "CREATE TRIGGER IF NOT EXISTS Settings_size_delete" ++ " AFTER DELETE ON Cache FOR EACH ROW BEGIN" ++ " UPDATE Settings SET value = value - OLD.size" ++ " WHERE key = 'size'; END" + ) + + # Create tag index if requested. +@@ -1177,10 +1177,10 @@ def get( + + else: # Slow path, transaction required. + cache_hit = ( +- 'UPDATE Settings SET value = value + 1 WHERE key = "hits"' ++ "UPDATE Settings SET value = value + 1 WHERE key = 'hits'" + ) + cache_miss = ( +- 'UPDATE Settings SET value = value + 1 WHERE key = "misses"' ++ "UPDATE Settings SET value = value + 1 WHERE key = 'misses'" + ) + + with self._transact(retry) as (sql, _): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 260b7d4..427520f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,10 +8,12 @@ package: source: url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz sha256: 2c3a3fa2743d8535d832ec61c2054a1641f41775aa7c556758a109941e33e4fc + patches: + - 0000-sql-dqs-off.patch build: noarch: python - number: 1 + number: 2 script: {{ PYTHON }} -m pip install . --no-deps -vv requirements: From 5f6f26bd07c66c03f67df662bc96156e6b9515f9 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 06:50:49 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.46.1, and conda-forge-pinning 2025.03.03.02.00.54 --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 179afe5..47b5408 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,8 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output +# Pixi's configuration +.pixi