Skip to content

Commit

Permalink
Merge pull request #25 from algrebe/travis-integration
Browse files Browse the repository at this point in the history
references #17, fix travis docs - attempt 6
  • Loading branch information
algrebe authored Dec 20, 2016
2 parents 25d72e1 + 18f5929 commit a34e0c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ language: python
python:
- "2.7"
install:
- "pip -v install ."
- "pip install ."
script:
- echo "no tests yet"
before_install:
before_deploy:
- "wget https://github.com/jgm/pandoc/releases/download/1.19.1/pandoc-1.19.1-1-amd64.deb -O $TRAVIS_BUILD_DIR/pandoc.deb"
- "sudo dpkg -i $TRAVIS_BUILD_DIR/pandoc.deb"
- "rm $TRAVIS_BUILD_DIR/pandoc.deb"
- "echo `pwd`"
- "pandoc --version"
- "pandoc --from=markdown --to=rst --output=$TRAVIS_BUILD_DIR/README.rst README.md"
- "ls -alhrt README*"
deploy:
# test pypi
- provider: pypi
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ def get_long_description():
for d in dirs:
rst_readme = os.path.join(d, "README.rst")
if not os.path.exists(rst_readme):
print "failed to find %s" % rst_readme
continue

print "found rst readme %s" % rst_readme
with open(rst_readme) as fp:
long_description = fp.read()
return long_description

return long_description

Expand Down

0 comments on commit a34e0c9

Please sign in to comment.