chore(pypi): switch to markdown and twine for pypi upload + update supported version

Saurabh Kumar · Saurabh Kumar · commit 73124de45fcc · 2019-05-12T17:27:39.000+05:30
diff --git a/Makefile b/Makefile
@@ -5,19 +5,22 @@ clean: clean-build clean-pyc
 clean-build:
 	rm -fr build/
 	rm -fr dist/
-	rm -fr *.egg-info
+	rm -fr src/*.egg-info
 
 clean-pyc:
 	find . -name '*.pyc' -exec rm -f {} +
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
 
-release: clean
-	python setup.py sdist upload
-	python setup.py bdist_wheel upload
+release: sdist
+	twine check dist/*
+	twine upload dist/*
+
+release-test: sdist
+	twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 
 sdist: clean
-	python setup.py sdist
+	python setup.py sdist bdist_wheel
 	ls -l dist
 
 test:
diff --git a/requirements.txt b/requirements.txt
@@ -3,9 +3,9 @@ typing; python_version<"3.5"
 click
 flake8>=2.2.3
 ipython
-pypandoc
 pytest-cov
 pytest>=3.9
 sh>=1.09
 tox
 wheel
+twine
diff --git a/setup.py b/setup.py
@@ -1,17 +1,8 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup
 
-# https://github.com/theskumar/python-dotenv/issues/45#issuecomment-277135416
-try:
-    import pypandoc
-    long_description = pypandoc.convert('README.md', 'rst')
-    long_description = long_description.replace("\r", "")  # YOU  NEED THIS LINE
-except (OSError, ImportError):
-    print("Pandoc not found. Long_description conversion failure.")
-    import io
-    # pandoc is not installed, fallback to using raw contents
-    with io.open('README.md', encoding="utf-8") as f:
-        long_description = f.read()
+with open('README.md') as f:
+    long_description = f.read()
 
 meta = {}
 with open('./src/dotenv/version.py') as f:
@@ -21,6 +12,7 @@
     name="python-dotenv",
     description="Add .env support to your django/flask apps in development and deployments",
     long_description=long_description,
+    long_description_content_type='text/markdown',
     version=meta['__version__'],
     author="Saurabh Kumar",
     author_email="me+github@saurabh-kumar.com",
@@ -52,20 +44,21 @@
         # 'Development Status :: 6 - Mature',
         # 'Development Status :: 7 - Inactive',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
+        # 'Programming Language :: Python :: 2',
         # 'Programming Language :: Python :: 2.3',
         # 'Programming Language :: Python :: 2.4',
         # 'Programming Language :: Python :: 2.5',
         # 'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.0',
-        'Programming Language :: Python :: 3.1',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
+        # 'Programming Language :: Python :: 3',
+        # 'Programming Language :: Python :: 3.0',
+        # 'Programming Language :: Python :: 3.1',
+        # 'Programming Language :: Python :: 3.2',
+        # 'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
