From 790bb04ae590072568fb3709367ba3b91e67848c Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 11 Feb 2019 23:08:24 +0200 Subject: [PATCH] Update dockerfile and handle readme read error in setup.py --- Dockerfile | 2 +- setup.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1431b498..d82b428b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.8 +FROM docker.io/alpine:3.9 ENV UID=1337 \ GID=1337 \ diff --git a/setup.py b/setup.py index d500945f..0b483075 100644 --- a/setup.py +++ b/setup.py @@ -6,11 +6,16 @@ extras = { "highlight_edits": ["lxml>=4.1.1,<5"], "better_formatter": ["lxml>=4.1.1,<5"], "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"], } 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( name="mautrix-telegram", version=mautrix_telegram.__version__, @@ -20,7 +25,7 @@ setuptools.setup( author_email="tulir@maunium.net", description="A Matrix-Telegram hybrid puppeting/relaybot bridge.", - long_description=open("README.md").read(), + long_description=long_desc, long_description_content_type="text/markdown", packages=setuptools.find_packages(),