Compare commits

..

7 Commits

Author SHA1 Message Date
Tulir Asokan 4b03cddde8 Bump version to 0.8.2 2020-07-27 13:55:09 +03:00
Tulir Asokan 6eec096501 Bump minimum mautrix-python version to v0.5.8 2020-07-27 13:55:09 +03:00
Tulir Asokan 78cdb43c65 Fix using edge repos in docker image
Backported from 482a52cb5e
2020-07-27 13:54:54 +03:00
Tulir Asokan 4b57be3917 Bump version to 0.8.1 2020-06-08 17:45:19 +03:00
Tulir Asokan 9383e5eed2 Allow any 0.5.x version of mautrix-python
Fixes #479
2020-06-08 12:36:18 +03:00
Tulir Asokan a3b4a5e30e Update Docker image to Alpine 3.12 2020-06-06 20:10:14 +03:00
Tulir Asokan 72a45d7d80 Bump version to 0.8.0 2020-06-03 15:37:07 +03:00
4 changed files with 22 additions and 21 deletions
+18 -17
View File
@@ -1,19 +1,22 @@
FROM dock.mau.dev/tulir/lottieconverter:alpine-3.11
FROM dock.mau.dev/tulir/lottieconverter:alpine-3.12
RUN echo "@edge_main http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories
RUN echo "@edge_testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
RUN echo $'\
@edge http://dl-cdn.alpinelinux.org/alpine/edge/main\n\
@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing\n\
@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories
RUN apk add --no-cache \
python3 py3-pip py3-setuptools py3-wheel \
py3-virtualenv \
py3-pillow \
py3-aiohttp \
py3-magic \
py3-sqlalchemy \
py3-alembic@edge_testing \
py3-telethon-session-sqlalchemy@edge \
py3-alembic@edge \
py3-psycopg2 \
py3-ruamel.yaml \
py3-commonmark@edge_testing \
py3-commonmark@edge \
# Indirect dependencies
py3-idna \
#moviepy
@@ -22,8 +25,7 @@ RUN apk add --no-cache \
py3-requests \
#imageio
py3-numpy \
#telethon
py3-rsa \
py3-telethon@edge \
# Optional for socks proxies
py3-pysocks \
# cryptg
@@ -35,20 +37,19 @@ RUN apk add --no-cache \
su-exec \
netcat-openbsd \
# olm
olm-dev@edge_community \
olm-dev \
# matrix-nio?
py3-future \
py3-atomicwrites \
py3-pycryptodome@edge_main \
py3-peewee@edge_community \
py3-pyrsistent@edge_community \
py3-pycryptodome \
py3-peewee \
py3-pyrsistent \
py3-jsonschema \
py3-aiofiles \
py3-cachetools@edge_community \
py3-prometheus-client@edge_community \
#py3-aiofiles \ # (too new)
py3-cachetools \
py3-unpaddedbase64 \
py3-pyaes@edge_testing \
py3-logbook@edge_testing
py3-h2@edge \
py3-logbook@edge
COPY requirements.txt /opt/mautrix-telegram/requirements.txt
COPY optional-requirements.txt /opt/mautrix-telegram/optional-requirements.txt
+1 -1
View File
@@ -1,2 +1,2 @@
__version__ = "0.8.0rc5"
__version__ = "0.8.2"
__author__ = "Tulir Asokan <tulir@maunium.net>"
+2 -2
View File
@@ -14,10 +14,10 @@ pillow>=4.3,<8
moviepy>=1,<2
#/metrics
prometheus_client>=0.6,<0.8
prometheus_client>=0.6,<0.9
#/postgres
psycopg2-binary>=2,<3
#/e2be
matrix-nio[e2e]>=0.9,<0.11
matrix-nio[e2e]>=0.9,<0.13
+1 -1
View File
@@ -4,6 +4,6 @@ ruamel.yaml>=0.15.35,<0.17
python-magic>=0.4,<0.5
commonmark>=0.8,<0.10
aiohttp>=3,<4
mautrix==0.5.0rc2
mautrix>=0.5.8,<0.6
telethon>=1.13,<1.15
telethon-session-sqlalchemy>=0.2.14,<0.3