From 70cccf2a3f3f3dfef6b887d1b6c835f95aa07aad Mon Sep 17 00:00:00 2001
From: BoppreH <boppreh@gmail.com>
Date: Tue, 8 Aug 2017 10:44:30 -0300
Subject: [PATCH] More fixes to release process

---
 make_release.py | 3 ++-
 setup.py        | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/make_release.py b/make_release.py
index f3e3a41d..cfa6dd7e 100644
--- 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
index 639cf937..0a6302f9 100644
--- 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',
     ],
-)
\ No newline at end of file
+)