From 1d36d817f0192f763b349bbc862b35845c0e7745 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 27 Nov 2018 18:22:03 +0100 Subject: [PATCH] python: remove m2r from setup.py --- python/setup.py | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/python/setup.py b/python/setup.py index 0fa6bbb02..9afba3213 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,30 +1,13 @@ -import os, re +import os from setuptools import setup from glob import glob -def cleanhtml(raw_html): - cleanr = re.compile('<.*?>') - cleantext = re.sub(cleanr, '', raw_html) - return cleantext - -def read(fname): - dname = os.path.dirname(__file__) - fname = os.path.join(dname, fname) - - with open(fname) as f: - contents = f.read() - sanatized = cleanhtml(contents) - - try: - from m2r import M2R - m2r = M2R() - return m2r(sanatized) - except: - return sanatized +with open('README.md') as f: + long_description = f.read() setup( name = 'villas-node', - version = '0.6.4', + version = '0.6.4.1', author = 'Steffen Vogel', author_email = 'acs-software@eonerc.rwth-aachen.de', description = 'Python-support for VILLASnode simulation-data gateway', @@ -32,7 +15,8 @@ setup( keywords = 'simulation power system real-time villas', url = 'https://git.rwth-aachen.de/acs/public/villas/dataprocessing', packages = [ 'villas.node' ], - long_description = read('README.md'), + long_description = long_description, + long_description_content_type = 'text/markdown', classifiers = [ 'Development Status :: 4 - Beta', 'Topic :: Scientific/Engineering',