More fixes to release process

boppreh · Aug 8, 2017 · 70cccf2 · 70cccf2
1 parent 8def870
commit 70cccf2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/make_release.py b/make_release.py
@@ -103,5 +103,6 @@
     response = requests.post(releases_url, json=release, headers={'Authorization': 'token ' + token})
     print(response.status_code, response.text)
 
-run(['python', 'setup.py', 'sdist', '--format=zip', 'bdist', '--format=zip', 'bdist_wheel', '--universal', 'bdist_wininst'], check=True)
+run(['python', 'setup.py', 'clean'], check=True)
+run(['python', 'setup.py', 'sdist', '--format=zip', 'bdist_wheel', '--universal', 'bdist_wininst'], check=True)
 run(['twine', 'upload', 'dist/*'], check=True, shell=True)
diff --git a/setup.py b/setup.py
@@ -15,6 +15,10 @@
 import re
 last_version = re.search('(\d+(?:\.\d+)+)', open('CHANGES.md').read()).group(1)
 
+# Wheel creation breaks with Windows newlines.
+# https://github.com/pypa/setuptools/issues/1126
+long_description = long_description.replace('\r\n', '\n')
+
 from setuptools import setup
 setup(
     name='keyboard',
@@ -39,4 +43,4 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Utilities',
     ],
-)
+)