Fix long description

maxmind · Nov 22, 2016 · 29980a1 · 29980a1
1 parent 377c519
commit 29980a1
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 42 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -3,12 +3,13 @@
 History
 -------
 
-1.3.0 (2016-11-21)
+1.3.0 (2016-11-22)
 ++++++++++++++++++
 
 * The disposition was added to the minFraud response models. This is used to
   return the disposition of the transaction as set by the custom rules for the
   account.
+* Fixed package's long description for display on PyPI.
 
 1.2.0 (2016-11-14)
 ++++++++++++++++++

diff --git a/setup.py b/setup.py
@@ -1,9 +1,7 @@
 #!/usr/bin/env python
 
 import ast
-import os
 import re
-import sys
 
 # This is necessary for Python 2.6 on Travis for some reason.
 import multiprocessing
@@ -12,43 +10,50 @@
 
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
 
-with open('minfraud/version.py', 'rb') as f:
-    _version = str(ast.literal_eval(_version_re.search(f.read().decode(
-        'utf-8')).group(1)))
+with open('minfraud/version.py', 'r', encoding='utf-8') as f:
+    _version = str(ast.literal_eval(_version_re.search(f.read()).group(1)))
 
-setup(name='minfraud',
-      version=_version,
-      description='MaxMind minFraud Score and Insights API',
-      long_description=__doc__,
-      author='Gregory Oschwald',
-      author_email='goschwald@maxmind.com',
-      url='http://www.maxmind.com/',
-      packages=['minfraud'],
-      include_package_data=True,
-      platforms='any',
-      install_requires=['geoip2>=2.4.0',
-                        'requests>=2.7',
-                        'rfc3987',
-                        'strict-rfc3339',
-                        'validate_email',
-                        'voluptuous', ],
-      extras_require={
-          ':python_version=="2.6" or python_version=="2.7"': ['ipaddress']
-      },
-      tests_require=['requests_mock'],
-      test_suite="tests",
-      license='Apache License 2.0 ',
-      classifiers=['Development Status :: 5 - Production/Stable',
-                   'Environment :: Web Environment',
-                   'Intended Audience :: Developers',
-                   'License :: OSI Approved :: Apache Software License',
-                   'Programming Language :: Python :: 2.6',
-                   'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3',
-                   'Programming Language :: Python :: 3.3',
-                   'Programming Language :: Python :: 3.4',
-                   'Programming Language :: Python :: 3.5',
-                   'Programming Language :: Python',
-                   'Topic :: Internet :: Proxy Servers',
-                   'Topic :: Internet :: WWW/HTTP',
-                   'Topic :: Internet', ], )
+with open('README.rst', 'r', encoding='utf-8') as f:
+    _readme = f.read()
+
+setup(
+    name='minfraud',
+    version=_version,
+    description='MaxMind minFraud Score and Insights API',
+    long_description=_readme,
+    author='Gregory Oschwald',
+    author_email='goschwald@maxmind.com',
+    url='http://www.maxmind.com/',
+    packages=['minfraud'],
+    include_package_data=True,
+    platforms='any',
+    install_requires=[
+        'geoip2>=2.4.0',
+        'requests>=2.7',
+        'rfc3987',
+        'strict-rfc3339',
+        'validate_email',
+        'voluptuous',
+    ],
+    extras_require={
+        ':python_version=="2.6" or python_version=="2.7"': ['ipaddress']
+    },
+    tests_require=['requests_mock'],
+    test_suite="tests",
+    license='Apache License 2.0 ',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python',
+        'Topic :: Internet :: Proxy Servers',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet',
+    ], )