Introduce markdown on PyPi (django-webpack#162)

Author: 4383

Makefile

@@ -18,17 +18,15 @@ clean:
 
 build: clean
 @echo "Building..."
+@pip install -U setuptools
 @python setup.py sdist bdist_wheel --universal
 
 install:
 @echo "Installing build dependencies"
 @[ ! -d $(ENV)/ ] && python3 -m venv $(ENV)/ || :
 @$(ENV)/bin/pip install $(requirements)
 
-generate-rst:
-@pandoc --from=markdown --to=rst --output=README.rst README.md
-
-publish: generate-rst build
+publish: build
 @echo "Publishing to pypi..."
 @$(ENV)/bin/twine upload -r $(REPOSITORY) dist/*
 

README.md

@@ -16,14 +16,6 @@ Django webpack loader consumes the output generated by [webpack-bundle-tracker](
 
 A [changelog](CHANGELOG.md) is also available.
 
-## Maintainers
-In order to overcome the lack of support for Markdown on PyPi, building this package can use [pandoc](http://pandoc.org/installing.html) along with [pypandoc](https://pypi.python.org/pypi/pypandoc) to convert the README.md into a Restructured Text format compatible with PyPI. This requires installing `pandoc` for your operating system (installation instructions on the pandoc site), and `pypandoc` which will be installed if you:
-
- pip install -r requirements-dev.txt
-
-before uploading to PyPI.
-
-If pandoc or pypandoc fails, the README.md file will be uploaded as it was before this enhancement.
 
 ## Compatibility
 

setup.py

@@ -8,10 +8,7 @@ def rel(*parts):
  '''returns the relative path to a file wrt to the current directory'''
  return os.path.abspath(os.path.join(os.path.dirname(__file__), *parts))
 
-if os.path.isfile('README.rst'):
- README = open('README.rst', 'r').read()
-else:
- README = open('README.md', 'r').read()
+README = open('README.md', 'r').read()
 
 with open(rel('webpack_loader', '__init__.py')) as handler:
  INIT_PY = handler.read()
@@ -25,6 +22,7 @@ def rel(*parts):
  version = VERSION,
  description = 'Transparently use webpack with django',
  long_description=README,
+ long_description_content_type="text/markdown",
  author = 'Owais Lone',
  author_email = 'hello@owaislone.org',
  download_url = 'https://github.com/owais/django-webpack-loader/tarball/{0}'.format(VERSION),