Skip to content

Commit

Permalink
Merge pull request #78 from dotlambda/m2r
Browse files Browse the repository at this point in the history
Use m2r instead of pypandoc
  • Loading branch information
nocarryr committed Mar 13, 2018
2 parents f77a767 + 56ba017 commit dcf8511
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ addons:
apt:
packages:
- libusb-1.0-0-dev
- pandoc
before_install:
- cd tools/travis
- ./install-librtlsdr.sh
- cd ../..
- export LD_LIBRARY_PATH=$HOME/.local:$LD_LIBRARY_PATH
install:
- pip install -U pip setuptools wheel pypandoc
- pip install -U pip setuptools wheel m2r
- pip install -U pytest pytest-xdist pytest-cov coveralls
- pip install -e .
script:
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#README = open(os.path.join(HERE, 'README.md')).read()

def convert_readme():
import pypandoc
rst = pypandoc.convert_file('README.md', 'rst')
from m2r import parse_from_file
rst = parse_from_file('README.md')
with open('README.rst', 'w') as f:
f.write(rst)
return rst
Expand Down Expand Up @@ -67,6 +67,6 @@ def read_rst():
'Topic :: Utilities'],
license='GPLv3',
keywords='radio librtlsdr rtlsdr sdr',
setup_requires=['pypandoc'],
setup_requires=['m2r'],
platforms=['any'],
packages=find_packages(exclude=['tests*']))

0 comments on commit dcf8511

Please sign in to comment.