Merge pull request #601 from adobe-type-tools/release

Release 2.8.1

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)
 ---------------------------
 

setup.cfg

@@ -1,5 +1,2 @@
-[bdist_wheel]
-universal=0
-
 [metadata]
 license_file = LICENSE.md

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'.")
@@ -214,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()