From 1e3d4f634906455dfed64bdf7b080884806a2727 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Tue, 4 Sep 2018 14:37:56 +0100
Subject: [PATCH 1/4] setup.py: build 'universal' py2.py3 wheels

---
 setup.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index f8e3986fd..7e90c2466 100644
--- a/setup.py
+++ b/setup.py
@@ -13,19 +13,21 @@
 import setuptools.command.install
 from setuptools import setup
 
-"""
-We need a customized version of the 'bdist_wheel' command, because otherwise
-the wheel is identified as being non-platform specific. This is because the
-afdko has no Python extensions and the command line tools are installed as
-data files.
-"""
 try:
     from wheel.bdist_wheel import bdist_wheel
 
     class CustomBDistWheel(bdist_wheel):
+        """Mark the wheel as "universal" (both python 2 and 3), yet
+        platform-specific, since it contains native C executables.
+        """
+
         def finalize_options(self):
             bdist_wheel.finalize_options(self)
             self.root_is_pure = False
+
+        def get_tag(self):
+            return ('py2.py3', 'none',) + bdist_wheel.get_tag(self)[2:]
+
 except ImportError:
     print("afdko: setup.py requires that the Python package 'wheel' be "
           "installed. Try the command 'pip install wheel'.")

From e7b6429f3dbeb604ac323753b096a77283faf332 Mon Sep 17 00:00:00 2001
From: Cosimo Lupo <cosimo@anthrotype.com>
Date: Thu, 6 Sep 2018 09:55:48 +0100
Subject: [PATCH 2/4] setup.cfg: remove [bdist_wheel] universal=0

---
 setup.cfg | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 63be60212..21934a22d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,2 @@
-[bdist_wheel]
-universal=0
-
 [metadata]
 license_file = LICENSE.md

From 739be20491906fe9c49dd8e744253b0464da661e Mon Sep 17 00:00:00 2001
From: Miguel Sousa <msousa@adobe.com>
Date: Fri, 7 Sep 2018 14:15:55 -0700
Subject: [PATCH 3/4] [setup.py] Add blank line between README.md and NEWS.md

Fixes the formatting of 'Project description' on https://pypi.org/project/afdko/
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 7e90c2466..410eae6cf 100644
--- a/setup.py
+++ b/setup.py
@@ -216,6 +216,7 @@ def main():
     # Copied from fonttools setup.py
     with io.open("README.md", encoding="utf-8") as readme:
         long_description = readme.read()
+    long_description += '\n'
     with io.open("NEWS.md", encoding="utf-8") as changelog:
         long_description += changelog.read()
 

From f3b2131d11f7456ba0954d4f5bca5f5ecaa6e288 Mon Sep 17 00:00:00 2001
From: Miguel Sousa <msousa@adobe.com>
Date: Fri, 7 Sep 2018 15:19:06 -0700
Subject: [PATCH 4/4] Update NEWS with version 2.8.1 changes

---
 NEWS.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 61eca0eae..cb96f83bb 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.8.1 (released 2018-09-07)
+---------------------------
+
+- Made the wheels 'universal' py2.py3
+  ([#595](https://github.com/adobe-type-tools/afdko/pull/595))
+
 2.8.0 (released 2018-09-07)
 ---------------------------