Skip to content

Commit

Permalink
Update mautrix-python and stop supporting pickle for crypto store
Browse files Browse the repository at this point in the history
SQLite is now supported for the crypto store instead of pickle (via aiosqlite)
  • Loading branch information
tulir committed Nov 13, 2021
1 parent f2a9f4a commit 76b2937
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
9 changes: 1 addition & 8 deletions mautrix_telegram/example-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions optional-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 76b2937

Please sign in to comment.