summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-03-24 11:33:04 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2021-03-24 19:04:30 -0400
commit4476dca00786adef5da3bcf74699e0b217f8ffa6 (patch)
treeef4e6e9a82a768e04d5fd8ba3fb3ef2aa6cb270c /tox.ini
parent218177c4d60c5c4ab0524a0ab347e1c711458e3c (diff)
downloadsqlalchemy-4476dca00786adef5da3bcf74699e0b217f8ffa6.tar.gz
Repair pysqlcipher and use sqlcipher3
The ``pysqlcipher`` dialect now imports the ``sqlcipher3`` module for Python 3 by default. Regressions have been repaired such that the connection routine was not working. To better support the post-connection steps of the pysqlcipher dialect, a new hook Dialect.on_connect_url() is added, which supersedes Dialect.on_connect() and is passed the URL object. The dialect now pulls the passphrase and other cipher args from the URL directly without including them in the "connect" args. This will allow any user-defined extensibility to connecting to work as it would for other dialects. The commit also builds upon the extended routines in sqlite/provisioning.py to better support running tests against multiple simultaneous SQLite database files. Additionally enables backend for test_sqlite which was skipping everything for aiosqlite too, fortunately everything there is passing. Fixes: #5848 Change-Id: I43f53ebc62298a84a4abe149e1eb699a027b7915
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index e01b82372..783140502 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,7 @@ deps=
sqlite: .[aiosqlite]
sqlite_file: .[aiosqlite]
+ sqlite_file: .[sqlcipher]; python_version >= '3'
postgresql: .[postgresql]
postgresql: .[postgresql_asyncpg]; python_version >= '3'
postgresql: .[postgresql_pg8000]; python_version >= '3'
@@ -38,6 +39,9 @@ deps=
mssql: .[mssql]
+ dbapimaster-sqlite: git+https://github.com/omnilib/aiosqlite.git#egg=aiosqlite
+ dbapimaster-sqlite: git+https://github.com/coleifer/sqlcipher3.git#egg=sqlcipher3
+
dbapimaster-postgresql: git+https://github.com/psycopg/psycopg2.git@master#egg=psycopg2
dbapimaster-postgresql: git+https://github.com/MagicStack/asyncpg.git#egg=asyncpg
dbapimaster-postgresql: git+https://github.com/tlocke/pg8000.git#egg=pg8000
@@ -88,7 +92,7 @@ setenv=
sqlite: SQLITE={env:TOX_SQLITE:--db sqlite}
sqlite_file: SQLITE={env:TOX_SQLITE_FILE:--db sqlite_file}
py3{,5,6,7,8,9,10,11}-sqlite: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver aiosqlite}
- py3{,5,6,7,8,9,10,11}-sqlite_file: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver aiosqlite}
+ py3{,5,6,7,8,9,10,11}-sqlite_file: EXTRA_SQLITE_DRIVERS={env:EXTRA_SQLITE_DRIVERS:--dbdriver sqlite --dbdriver aiosqlite --dbdriver pysqlcipher}
postgresql: POSTGRESQL={env:TOX_POSTGRESQL:--db postgresql}
py2{,7}-postgresql: POSTGRESQL={env:TOX_POSTGRESQL_PY2K:{env:TOX_POSTGRESQL:--db postgresql}}