Ensure that pip is up-to-date

JohnVinyard · Aug 30, 2018 · 1194fe3 · 1194fe3
1 parent 9741550
commit 1194fe3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,6 +24,7 @@ install:
   - conda create -q -n test-environment -c pytorch -c hcc -c conda-forge python=$TRAVIS_PYTHON_VERSION numpy=1.12 scipy=0.19 cython pytorch=0.4 torchvision libsndfile=1.0.28 libsamplerate=0.1.8 libflac=1.3.1 libogg=1.3.2
   - sudo ldconfig /opt/conda/lib
   - source activate test-environment
+  - pip install --upgrade pip
   - python setup.py install
   - pip install coveralls
   - ls /usr/lib/x86_64-linux-gnu/libsndfile.*

diff --git a/setup.py b/setup.py
@@ -1,13 +1,15 @@
 from setuptools import setup
 import re
 import os
+import warnings
 
 try:
     import pypandoc
-
     long_description = pypandoc.convert('README.md', 'rst')
-except(IOError, ImportError):
+except(IOError, ImportError, RuntimeError):
     long_description = open('README.md').read()
+    warnings.warn('pypandoc is not working correctly')
+
 
 with open('zounds/__init__.py', 'r') as fd:
     version = re.search(