execsql2 2.17.2__tar.gz → 2.17.3__tar.gz

{execsql2-2.17.2 → execsql2-2.17.3}/.gitignore

@@ -7,6 +7,7 @@ dist/
 build/
 .eggs/
 .ruff_cache/
+.mypy_cache/
 
 # uv / venv
 .venv/

{execsql2-2.17.2 → execsql2-2.17.3}/CHANGELOG.md

@@ -13,6 +13,14 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
+## [2.17.3] - 2026-05-26
+
+### Changed
+
+- Optional `[upsert]` extra now requires `pg-upsert>=1.22.1` (was `>=1.22.0`). 1.22.1 removed upper bounds on its `typer` and `pyyaml` dependencies, so installing `execsql2[upsert]` alongside the latest Typer/PyYAML no longer triggers a resolver conflict.
+
+______________________________________________________________________
+
 ## [2.17.2] - 2026-05-26
 
 ### Fixed

{execsql2-2.17.2 → execsql2-2.17.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: execsql2
-Version: 2.17.2
+Version: 2.17.3
 Summary: Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables.
 Project-URL: Homepage, https://execsql2.readthedocs.io
 Project-URL: Repository, https://github.com/geocoug/execsql
@@ -52,7 +52,7 @@ Requires-Dist: keyring; extra == 'all'
 Requires-Dist: odfpy; extra == 'all'
 Requires-Dist: openpyxl; extra == 'all'
 Requires-Dist: oracledb; extra == 'all'
-Requires-Dist: pg-upsert>=1.22.0; extra == 'all'
+Requires-Dist: pg-upsert>=1.22.1; extra == 'all'
 Requires-Dist: polars; extra == 'all'
 Requires-Dist: psycopg2-binary; extra == 'all'
 Requires-Dist: pymysql; extra == 'all'
@@ -120,7 +120,7 @@ Requires-Dist: oracledb; extra == 'oracle'
 Provides-Extra: postgres
 Requires-Dist: psycopg2-binary; extra == 'postgres'
 Provides-Extra: upsert
-Requires-Dist: pg-upsert>=1.22.0; extra == 'upsert'
+Requires-Dist: pg-upsert>=1.22.1; extra == 'upsert'
 Description-Content-Type: text/markdown
 
 > [!NOTE]

{execsql2-2.17.2 → execsql2-2.17.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "execsql2"
-version = "2.17.2"
+version = "2.17.3"
 description = "Runs a SQL script against a PostgreSQL, SQLite, MariaDB/MySQL, DuckDB, Firebird, MS-Access, MS-SQL-Server, or Oracle database, or an ODBC DSN. Provides metacommands to import and export data, copy data between databases, conditionally execute SQL and metacommands, and dynamically alter SQL and metacommands with substitution variables."
 readme = { file = "README.md", content-type = "text/markdown" }
 license = { file = "LICENSE.txt" }
@@ -61,7 +61,7 @@ formats = ["odfpy", "xlrd", "openpyxl", "Jinja2", "polars", "tables", "PyYAML"]
 auth = ["keyring"]
 auth-plaintext = ["keyring", "keyrings.alt"]
 auth-encrypted = ["keyring", "keyrings.alt", "pycryptodome"]
-upsert = ["pg-upsert>=1.22.0"]
+upsert = ["pg-upsert>=1.22.1"]
 map = ["tkintermapview>=1.29"]
 # Convenience groups
 all-db = [
@@ -167,7 +167,7 @@ skip-magic-trailing-comma = false
 line-ending = "auto"
 
 [tool.bumpversion]
-current_version = "2.17.2"
+current_version = "2.17.3"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{execsql2-2.17.2 → execsql2-2.17.3}/uv.lock

@@ -679,7 +679,7 @@ wheels = [
 
 [[package]]
 name = "execsql2"
-version = "2.17.2"
+version = "2.17.3"
 source = { editable = "." }
 dependencies = [
     { name = "python-dateutil" },
@@ -816,7 +816,7 @@ requires-dist = [
     { name = "openpyxl", marker = "extra == 'formats'" },
     { name = "oracledb", marker = "extra == 'all-db'" },
     { name = "oracledb", marker = "extra == 'oracle'" },
-    { name = "pg-upsert", marker = "extra == 'upsert'", specifier = ">=1.22.0" },
+    { name = "pg-upsert", marker = "extra == 'upsert'", specifier = ">=1.22.1" },
     { name = "polars", marker = "extra == 'formats'" },
     { name = "pre-commit", marker = "extra == 'dev'", specifier = ">=3.5.0" },
     { name = "psycopg2-binary", marker = "extra == 'all-db'" },
@@ -1871,7 +1871,7 @@ wheels = [
 
 [[package]]
 name = "pg-upsert"
-version = "1.22.0"
+version = "1.22.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "psycopg2-binary" },
@@ -1879,9 +1879,9 @@ dependencies = [
     { name = "rich" },
     { name = "typer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/1a/f8/68b0b02d2e76561cfa580bee320eaf1884666d0d8faa2f2873650e907eef/pg_upsert-1.22.0.tar.gz", hash = "sha256:6ba63d3990689685464695c897be081e9d774c375228cc0bf1ee44340e6a6a6f", size = 1558932, upload-time = "2026-04-20T15:54:46.946Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f1/ba/10a1994fa328299b455bf5b382c85cf36b9256709e884028821f7c2e3626/pg_upsert-1.22.1.tar.gz", hash = "sha256:bf9fee3ef91bf3e3023f3f7722283c43c5375e6b263a10f05d002920c65dbb6c", size = 1559351, upload-time = "2026-05-26T19:03:56.479Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c3/f3/965c57af3bc89103d2f04435277c2c5e7e9b2bb9ce0653f434c55a570e4a/pg_upsert-1.22.0-py3-none-any.whl", hash = "sha256:c823af17c996ba5cb3ed8a2393882ea4a830a14d04965c090b73164b806f2309", size = 98581, upload-time = "2026-04-20T15:54:44.816Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/11/c57e1d22e50994238ca4116eb2c1b20cf8a27b18a359a867951ae885457b/pg_upsert-1.22.1-py3-none-any.whl", hash = "sha256:de8bf80c806af8f92307315cfd437807176253ac477880337ff1d92b539ad5cc", size = 98575, upload-time = "2026-05-26T19:03:54.358Z" },
 ]
 
 [[package]]

execsql2-2.17.2/examples/prompt_map_demo.sql

@@ -1,68 +0,0 @@
--- prompt_map_demo.sql
--- Demonstrates PROMPT MAP with SQLite.
--- Creates a table of US cities with lat/lon/label/color/symbol columns,
--- inserts a few rows, then opens an interactive map dialog with markers.
---
--- Run:
---     execsql -t l prompt_map_demo.sql cities.sqlite
---
--- The script creates cities.sqlite in the current directory (or reuses it).
--- Requires a GUI environment (Tkinter desktop or Textual TUI). The map
--- markers are colored/symboled per row.
-
-CREATE TABLE IF NOT EXISTS cities (
-    name   TEXT PRIMARY KEY,
-    lat    REAL NOT NULL,
-    lon    REAL NOT NULL,
-    color  TEXT,
-    symbol TEXT
-);
-
-DELETE FROM cities;
-
-INSERT INTO cities (name, lat, lon, color, symbol) VALUES
-    ('Seattle',        47.6062, -122.3321, 'blue',   'circle'),
-    ('Portland',       45.5152, -122.6784, 'blue',   'circle'),
-    ('San Francisco',  37.7749, -122.4194, 'green',  'square'),
-    ('Los Angeles',    34.0522, -118.2437, 'green',  'square'),
-    ('Denver',         39.7392, -104.9903, 'orange', 'triangle'),
-    ('Chicago',        41.8781,  -87.6298, 'red',    'star'),
-    ('New York',       40.7128,  -74.0060, 'red',    'star'),
-    ('Miami',          25.7617,  -80.1918, 'purple', 'diamond');
-
--- PROMPT MESSAGE "<text>" MAP <table>
---   LAT <lat_col> LON <lon_col>
---   [LABEL <label_col>] [COLOR <color_col>] [SYMBOL <symbol_col>]
---
----- !x! PROMPT MESSAGE "US cities — click a marker for details, then Continue to exit." MAP cities LAT lat LON lon LABEL name COLOR color SYMBOL symbol
-
--- !x! write "!!heythere!!"
-
--- !x! sub yesno yes
--- !x! if(!!yesno!!)
-    -- !x! write "level1"
-    -- !x! debug write iflevels
-    -- !x! if(true)
-        -- !x! write "level2"
-        -- !x! debug write iflevels
-        -- !x! breakpoint
-    -- !x! endif
--- !x! endif
-
-
--- !x! debug write COMMANDLISTSTACK
-
-/*
--- !x! debug write subvars
--- !x! debug write user subvars
--- !x! debug write local subvars
-
--- !x! debug write ODBC_DRIVERS
-
--- !x! export cities to cities.csv as csv
--- !x! export cities to cities.json as json
--- !x! export_metadata all to stdout as txt
-*/
-
-
--- Add jsonl as an input/output format with the .jsonl extension