diff --git a/mautrix_telegram/example-config.yaml b/mautrix_telegram/example-config.yaml index 028cce7f..e8e6e0fd 100644 --- a/mautrix_telegram/example-config.yaml +++ b/mautrix_telegram/example-config.yaml @@ -244,14 +244,7 @@ bridge: # Default to encryption, force-enable encryption in all portals the bridge creates # This will cause the bridge bot to be in private chats for the encryption to work properly. default: false - # Database for the encryption data. Currently only supports Postgres and an in-memory - # store that's persisted as a pickle. - # If set to `default`, will use the appservice postgres database - # or a pickle file if the appservice database is sqlite. - # - # Format examples: - # Pickle: pickle:///filename.pickle - # Postgres: postgres://username:password@hostname/dbname + # Database for the encryption data. If set to `default`, will use the appservice database. database: default # Options for automatic key sharing. key_sharing: diff --git a/optional-requirements.txt b/optional-requirements.txt index a3a444c5..4223029c 100644 --- a/optional-requirements.txt +++ b/optional-requirements.txt @@ -15,13 +15,16 @@ qrcode>=6,<7 moviepy>=1,<2 #/metrics -prometheus_client>=0.6,<0.12 +prometheus_client>=0.6,<0.13 #/postgres psycopg2-binary>=2,<3 +asyncpg>=0.20,<0.25 + +#/sqlite +aiosqlite>=0.17,<0.18 #/e2be -asyncpg>=0.20,<0.25 python-olm>=3,<4 pycryptodome>=3,<4 unpaddedbase64>=1,<2 diff --git a/requirements.txt b/requirements.txt index 35a5c707..526b5573 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,11 @@ python-magic>=0.4,<0.5 commonmark>=0.8,<0.10 aiohttp>=3,<4 yarl>=1,<2 -mautrix>=0.10.5,<0.11 +mautrix>=0.11.2,<0.12 #telethon>=1.22,<1.24 # Temporary patch for 64-bit IDs until upstream telethon 2.0 is ready tulir-telethon==1.24.0a2 telethon-session-sqlalchemy>=0.2.14,<0.3 +# Temporarily always depend on aiosqlite to prevent breaking old installs +# Will be removed in v0.12 (after which you need to choose the [sqlite] optional dependency) +aiosqlite>=0.17,<0.18