Merge pull request #1075 from ocefpaf/fix_pypi_rendering

fix pypi rendering

Author: ocefpaf

README.rst

@@ -69,3 +69,10 @@ See `our complete contributor's guide <https://github.com/python-visualization/f
 
 
 .. |folium| image:: http://python-visualization.github.io/folium/docs-master/_images/folium_logo.jpg
+
+
+
+Changelog
+---------
+
+Check the `changelog <https://raw.githubusercontent.com/python-visualization/folium/master/CHANGES.txt>`_ for a detailed list of the latest changes.

setup.cfg

@@ -9,3 +9,17 @@ versionfile_source = folium/_version.py
 versionfile_build = folium/_version.py
 tag_prefix = v
 parentdir_prefix =
+
+[tool:pytest]
+flake8-max-line-length = 120
+flake8-ignore =
+    docs/* ALL
+    versioneer.py ALL
+    folium/_version.py ALL
+
+[metadata]
+description-file = README.md
+license_file = LICENSE.txt
+
+[bdist_wheel]
+universal = 1

setup.py

@@ -43,9 +43,6 @@ def walk_subpkg(name):
     'folium.plugins'
 ]
 
-LICENSE = read('LICENSE.txt')
-long_description = '{}\n{}'.format(read('README.rst'), read('CHANGES.txt'))
-
 # Dependencies.
 with open('requirements.txt') as f:
     tests_require = f.readlines()
@@ -55,7 +52,9 @@ def walk_subpkg(name):
     name='folium',
     version=versioneer.get_version(),
     description='Make beautiful maps with Leaflet.js & Python',
-    long_description=long_description,
+    license="MIT",
+    long_description='{}'.format(read("README.rst")),
+    long_description_content_type="text/x-rst",
     author='Rob Story',
     author_email='[email protected]',
     url='https://github.com/python-visualization/folium',
@@ -69,11 +68,12 @@ def walk_subpkg(name):
         'Topic :: Scientific/Engineering :: GIS',
         'Topic :: Scientific/Engineering :: Visualization',
         'License :: OSI Approved :: MIT License',
-        'Development Status :: 5 - Production/Stable'],
+        'Development Status :: 5 - Production/Stable'
+    ],
+    platforms="any",
     packages=packages,
     package_data=package_data,
-    tests_require=['pytest'],
-    license=LICENSE,
+    extras_require={"testing": ["pytest"]},
     install_requires=install_requires,
     zip_safe=False,
     cmdclass=versioneer.get_cmdclass(),