From 8be74251c84755a9151d6c02fbda9def85cdf1fe Mon Sep 17 00:00:00 2001
From: Nathan Muir <ndmuir@gmail.com>
Date: Fri, 10 Aug 2018 12:02:30 +1000
Subject: [PATCH] Update .travis.yml

---
 .travis.yml | 10 +++-------
 setup.py    | 24 ++++--------------------
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c240dba..1c84c95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,16 +2,12 @@ language: python
 python:
 - '2.7'
 install:
-- pip install -U pip wheel pytest-runner setupext-pip~=1.0.5
-- python setup.py requirements -t -e documentation -e templates -e yaml
-- python setup.py develop
+- pip install -U pip pytest
+- pip install -e .[dev]
 script:
-- python setup.py test
+- py.test .
 cache:
   pip: true
-addons:
-  apt_packages:
-  - pandoc
 deploy:
   provider: pypi
   user: nathan-muir
diff --git a/setup.py b/setup.py
index 027ff91..20ab9dd 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,8 @@
 import codecs
-import sys
 from os.path import dirname, join
 
 from setuptools import setup, find_packages
 
-needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-pytest_runner = ['pytest-runner'] if needs_pytest else []
-
-needs_setupext_pip = {'requirements'}.intersection(sys.argv)
-setupext_pip = ['setupext-pip~=1.0.5'] if needs_setupext_pip else []
-
 here = dirname(__file__)
 
 
@@ -24,16 +17,6 @@ def find_version(*file_paths):
     return version
 
 
-def read_markdown(*file_paths):
-    try:
-        import pandoc.core
-        doc = pandoc.core.Document()
-        doc.markdown = read(*file_paths)
-        return doc.rst
-    except ImportError:
-        return ''
-
-
 setup(
     name='credsmash',
     version=find_version('credsmash', 'VERSION'),
@@ -45,7 +28,8 @@ def read_markdown(*file_paths):
 
     license='Apache2',
     description='A utility for managing secrets in the cloud using AWS KMS and DynamoDB',
-    long_description=read_markdown('README.md'),
+    long_description=read('README.md'),
+    long_description_content_type='text/markdown',
 
     packages=find_packages(exclude=('tests',)),
 
@@ -53,7 +37,6 @@ def read_markdown(*file_paths):
         'credsmash': ['VERSION']
     },
 
-    setup_requires=[] + pytest_runner + setupext_pip,
     install_requires=[
         'cryptography',
         'boto3',
@@ -66,7 +49,8 @@ def read_markdown(*file_paths):
     extras_require={
         'yaml': ['PyYAML'],
         'templates': ['jinja2'],
-        'documentation': ['pyandoc'],
+        'documentation': [],
+        'dev': ['PyYAML', 'jinja2', 'pytest']
     },
     entry_points={
         'console_scripts': [