iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Update dockerfile and handle readme read error in setup.py

Browse Source
This commit is contained in:
Tulir Asokan
2019-02-11 23:08:24 +02:00
parent 165f286bfd
commit 790bb04ae5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM docker.io/alpine:3.8 FROM docker.io/alpine:3.9
ENV UID=1337 \ ENV UID=1337 \
GID=1337 \ GID=1337 \
setup.py
+7 -2
View File
@@ -6,11 +6,16 @@ extras = {
"highlight_edits": ["lxml>=4.1.1,<5"], "highlight_edits": ["lxml>=4.1.1,<5"],
"better_formatter": ["lxml>=4.1.1,<5"], "better_formatter": ["lxml>=4.1.1,<5"],
"fast_crypto": ["cryptg>=0.1,<0.2"], "fast_crypto": ["cryptg>=0.1,<0.2"],
"webp_convert": ["Pillow>=5.0.0,<6"], "webp_convert": ["Pillow>=4.3.0,<6"],
"hq_thumbnails": ["moviepy>=0.2,<0.3", "imageio==2.4.1"], "hq_thumbnails": ["moviepy>=0.2,<0.3", "imageio==2.4.1"],
} }
extras["all"] = list(set(deps[0] for deps in extras.values())) extras["all"] = list(set(deps[0] for deps in extras.values()))
try:
long_desc = open("README.md").read()
except:
long_desc = "Failed to read README.md"
setuptools.setup( setuptools.setup(
name="mautrix-telegram", name="mautrix-telegram",
version=mautrix_telegram.__version__, version=mautrix_telegram.__version__,
@@ -20,7 +25,7 @@ setuptools.setup(
author_email="tulir@maunium.net", author_email="tulir@maunium.net",
description="A Matrix-Telegram hybrid puppeting/relaybot bridge.", description="A Matrix-Telegram hybrid puppeting/relaybot bridge.",
long_description=open("README.md").read(), long_description=long_desc,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
packages=setuptools.find_packages(), packages=setuptools.find_packages(),