Skip to content

Commit ed07e5c

Browse files
authored
Merge pull request #1075 from ocefpaf/fix_pypi_rendering
fix pypi rendering
2 parents 32f8fdd + d6d03a1 commit ed07e5c

File tree

3 files changed

+28
-7
lines changed

3 files changed

+28
-7
lines changed

README.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,10 @@ See `our complete contributor's guide <https://github.com/python-visualization/f
6969

7070

7171
.. |folium| image:: http://python-visualization.github.io/folium/docs-master/_images/folium_logo.jpg
72+
73+
74+
75+
Changelog
76+
---------
77+
78+
Check the `changelog <https://raw.githubusercontent.com/python-visualization/folium/master/CHANGES.txt>`_ for a detailed list of the latest changes.

setup.cfg

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,17 @@ versionfile_source = folium/_version.py
99
versionfile_build = folium/_version.py
1010
tag_prefix = v
1111
parentdir_prefix =
12+
13+
[tool:pytest]
14+
flake8-max-line-length = 120
15+
flake8-ignore =
16+
docs/* ALL
17+
versioneer.py ALL
18+
folium/_version.py ALL
19+
20+
[metadata]
21+
description-file = README.md
22+
license_file = LICENSE.txt
23+
24+
[bdist_wheel]
25+
universal = 1

setup.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ def walk_subpkg(name):
4343
'folium.plugins'
4444
]
4545

46-
LICENSE = read('LICENSE.txt')
47-
long_description = '{}\n{}'.format(read('README.rst'), read('CHANGES.txt'))
48-
4946
# Dependencies.
5047
with open('requirements.txt') as f:
5148
tests_require = f.readlines()
@@ -55,7 +52,9 @@ def walk_subpkg(name):
5552
name='folium',
5653
version=versioneer.get_version(),
5754
description='Make beautiful maps with Leaflet.js & Python',
58-
long_description=long_description,
55+
license="MIT",
56+
long_description='{}'.format(read("README.rst")),
57+
long_description_content_type="text/x-rst",
5958
author='Rob Story',
6059
author_email='[email protected]',
6160
url='https://github.com/python-visualization/folium',
@@ -69,11 +68,12 @@ def walk_subpkg(name):
6968
'Topic :: Scientific/Engineering :: GIS',
7069
'Topic :: Scientific/Engineering :: Visualization',
7170
'License :: OSI Approved :: MIT License',
72-
'Development Status :: 5 - Production/Stable'],
71+
'Development Status :: 5 - Production/Stable'
72+
],
73+
platforms="any",
7374
packages=packages,
7475
package_data=package_data,
75-
tests_require=['pytest'],
76-
license=LICENSE,
76+
extras_require={"testing": ["pytest"]},
7777
install_requires=install_requires,
7878
zip_safe=False,
7979
cmdclass=versioneer.get_cmdclass(),

0 commit comments

Comments
 (0)