Lock dependencies / use mautrix-python@bump-conn-pool-limit

Author: Half-Shot

Dockerfile

@@ -59,8 +59,9 @@ RUN apk add --virtual .build-deps \
  && apk del .build-deps
 
 COPY . /opt/mautrix-telegram
-RUN apk add git && pip3 install .[speedups,hq_thumbnails,metrics,e2be] && apk del git \
-  # This doesn't make the image smaller, but it's needed so that the `version` command works properly
+RUN apk add git && pip3 install .[speedups,hq_thumbnails,metrics,e2be] \
+  && pip3 install 'git+https://github.com/vector-im/mautrix-python@bump-conn-pool-limit#egg=mautrix' \
+  && apk del git \
   && cp mautrix_telegram/example-config.yaml . && rm -rf mautrix_telegram
 
 VOLUME /data

optional-requirements.txt

@@ -1,15 +1,79 @@
-SQLAlchemy>=1.2,<1.4
-alembic>=1,<2
-ruamel.yaml>=0.15.35,<0.18
-python-magic>=0.4,<0.5
-commonmark>=0.8,<0.10
-aiohttp>=3,<4
-yarl>=1,<2
-mautrix>=0.10.5,<0.11
-#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
-# as per t2bot reccomendations https://github.com/t2bot/mautrix-telegram/commit/77f6d5ca9d35e36b5cf1ba977497182364998090#diff-4d7c51b1efe9043e44439a949dfd92e5827321b34082903477fd04876edb7552R11-R12
-psycopg2
-uvloop
+aiodns==3.0.0
+aiohttp==3.7.4
+alembic==1.6.5
+appdirs==1.4.4
+asn1crypto==1.4.0
+async-timeout==3.0.1
+asyncpg==0.24.0
+attrs==20.3.0
+Automat==20.2.0
+Brotli==1.0.9
+CacheControl==0.12.6
+certifi==2020.12.5
+cffi==1.14.5
+characteristic==14.3.0
+colorama==0.4.4
+commonmark==0.9.1
+constantly==15.1.0
+contextlib2==0.6.0
+cryptg==0.2.post4
+cryptography==3.3.2
+decorator==4.4.2
+distlib==0.3.1
+distro==1.5.0
+filelock==3.0.12
+future==0.18.2
+html5lib==1.1
+hyperlink==21.0.0
+imageio==2.9.0
+imageio-ffmpeg==0.4.5
+incremental==17.5.0
+lockfile==0.12.2
+Mako==1.1.4
+MarkupSafe==2.0.1
+moviepy==1.0.3
+msgpack==1.0.2
+multidict==5.1.0
+numpy==1.20.3
+olefile==0.46
+ordered-set==4.0.2
+packaging==20.9
+pep517==0.10.0
+Pillow==8.2.0
+proglog==0.1.9
+progress==1.5
+prometheus-client==0.11.0
+psycopg2==2.8.6
+pyaes==1.6.1
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pycares==4.1.2
+pycparser==2.20
+pycryptodome==3.10.1
+PyHamcrest==2.0.2
+pyparsing==2.4.7
+PySocks==1.7.1
+python-dateutil==2.8.1
+python-editor==1.0.4
+python-magic==0.4.20
+qrcode==6.1
+requests==2.25.1
+retrying==1.3.3
+rsa==4.7.2
+ruamel.yaml==0.16.12
+ruamel.yaml.clib==0.2.2
+service-identity==18.1.0
+six==1.15.0
+SQLAlchemy==1.3.21
+Telethon==1.23.0
+telethon-session-sqlalchemy==0.2.16
+toml==0.10.2
+tqdm==4.61.1
+Twisted==21.2.0
+typing-extensions==3.10.0.0
+unpaddedbase64==1.1.0
+urllib3==1.26.5
+virtualenv==20.4.2
+webencodings==0.5.1
+yarl==1.6.3
+zope.interface==5.2.0