Merge pull request #40 from packethost/no-more-md-conversion

No more md conversion

Author: patrickdevivo

.drone.yml

@@ -16,6 +16,5 @@ pipeline:
   test:
     image: python:${PYTHON_VERSION}
     commands:
-      - apt update -y && apt install -y pandoc
-      - pip install pypandoc tox
+      - pip install tox
       - tox -e py$(echo ${PYTHON_VERSION} | sed 's|\.||')

.travis.yml

@@ -1,7 +1,3 @@
-addons:
-  apt:
-    packages:
-      - pandoc
 language: python
 python:
   - "2.7"
@@ -10,5 +6,5 @@ python:
   - "3.6"
 sudo: false
 
-install: pip install pypandoc tox
+install: pip install tox
 script: tox -e py$(echo "$TRAVIS_PYTHON_VERSION" | sed 's|\.||')

CHANGELOG.md

@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 ## Unreleased
 ### Removed
 - Support for python3.3
+### Changed
+- setup.py no longer converts markdown to reST because pypi now supports markdown, woop.
 
 ## [1.37.1] - 2018-01-08
 ### Fixed

MANIFEST.in

@@ -0,0 +1 @@
+include CHANGELOG.md

setup.py

@@ -1,8 +1,5 @@
 #!/usr/bin/env python
 
-import os
-import pypandoc
-
 # Notes for the not-an-everyday-python-dev for package distribution on pypi
 #
 # Build the package using `setuptools`:
@@ -44,24 +41,21 @@
     use_setuptools()
     from setuptools import setup
 
-long_description = 'This library provides the python client for the Packet API.'
-if os.path.isfile('README.md') and os.path.isfile('CHANGELOG.md'):
-    readme = pypandoc.convert_file('README.md', 'rst')
-    changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
-    long_description = readme + '\n' + changelog
+with open('README.md') as readme, open('CHANGELOG.md') as changelog:
+    long_description = readme.read() + '\n' + changelog.read()
 
 setup(
     name='packet-python',
     version='1.37.1',
     description='Packet API client',
     long_description=long_description,
+    long_description_content_type='text/markdown',
     url='https://github.com/packethost/packet-python',
     author='Packet Developers',
     license='LGPL v3',
     keywords='packet api client',
     packages=['packet'],
     install_requires='requests',
-    setup_requires='pypandoc',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

tox.ini

@@ -4,7 +4,6 @@ skip_missing_interpreters=True
 
 [testenv]
 deps =
-     pypandoc
      pytest
      pytest-cov
      requests_mock