Skip to content

Commit

Permalink
Merge pull request #15 from databio/dev
Browse files Browse the repository at this point in the history
0.2.4
  • Loading branch information
nsheff authored Aug 29, 2019
2 parents 0dd6002 + 0a911b8 commit d8821b0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## [0.2.3] -- (2019-07-29)
## [0.2.4] -- (2019-07-29)
- Add documentation
- Fix readme display
- Tweak variable names
Expand Down
2 changes: 1 addition & 1 deletion logmuse/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2.3"
__version__ = "0.2.4"
11 changes: 9 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,13 @@ def read_reqs(reqs_name):
version = versionfile.readline().split()[-1].strip("\"'\n")

# Handle the pypi README (long description) formatting.
import pypandoc
long_description = pypandoc.convert_file('README.md', 'rst')
try:
import pypandoc
long_description = pypandoc.convert_file('README.md', 'rst')
msg = "\033[032mPandoc conversion succeeded.\033[0m"
except(IOError, ImportError, OSError):
msg = "\033[0;31mWarning: pandoc conversion failed! Readme should not be uploaded to pypi.\033[0m"
long_description = open('README.md').read()

setup(
name=PKG,
Expand Down Expand Up @@ -58,3 +63,5 @@ def read_reqs(reqs_name):
**extra
)


print(msg)

0 comments on commit d8821b0

Please sign in to comment.