From c0aadb18038f2ce29dbdd9cc11be072b15fd34eb Mon Sep 17 00:00:00 2001 From: Giampaolo Rodola Date: Fri, 11 Nov 2022 07:29:43 -0800 Subject: fix long_description on Windows (see: #2168) --- setup.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 31777b9d..29039aad 100755 --- a/setup.py +++ b/setup.py @@ -118,18 +118,16 @@ else: py_limited_api = {} -def get_description(): +def get_long_description(): script = os.path.join(HERE, "scripts", "internal", "convert_readme.py") readme = os.path.join(HERE, 'README.rst') p = subprocess.Popen([sys.executable, script, readme], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout=subprocess.PIPE, stderr=subprocess.PIPE, + universal_newlines=True) stdout, stderr = p.communicate() if p.returncode != 0: raise RuntimeError(stderr) - data = stdout.decode('utf8') - if WINDOWS: - data = data.replace('\r\n', '\n') - return data + return stdout @contextlib.contextmanager @@ -388,7 +386,7 @@ def main(): version=VERSION, cmdclass=cmdclass, description=__doc__ .replace('\n', ' ').strip() if __doc__ else '', - long_description=get_description(), + long_description=get_long_description(), long_description_content_type='text/x-rst', keywords=[ 'ps', 'top', 'kill', 'free', 'lsof', 'netstat', 'nice', 'tty', -- cgit v1.2.1