diff --git a/CHANGELOG.md b/CHANGELOG.md index a67745e..f0ac722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ This is a high level and scarce summary of the changes between releases. Consult the full history of the [git repository](http://github.com/psychoinformatics-de/remodnav) for more details. +## 1.0 (Apr 25, 2019) + +- Improve program help + ## 0.2 (Apr 23, 2019) - Ability to distinguish any number of fixation and pursuit events within diff --git a/remodnav/__init__.py b/remodnav/__init__.py index 2b55aea..34f66a0 100644 --- a/remodnav/__init__.py +++ b/remodnav/__init__.py @@ -6,7 +6,7 @@ # copyright and license terms. # # ## ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ## -__version__ = '0.3' +__version__ = '1.0' import logging lgr = logging.getLogger('remodnav') diff --git a/setup.py b/setup.py index b8d5017..0dc1065 100755 --- a/setup.py +++ b/setup.py @@ -19,21 +19,8 @@ def get_version(): # extension version version = get_version() -# PyPI doesn't render markdown yet. Workaround for a sane appearance -# https://github.com/pypa/pypi-legacy/issues/148#issuecomment-227757822 -README = opj(dirname(__file__), 'README.md') -try: - import pypandoc - long_description = pypandoc.convert(README, 'rst') -except (ImportError, OSError) as exc: - # attempting to install pandoc via brew on OSX currently hangs and - # pypandoc imports but throws OSError demanding pandoc - print( - "WARNING: pypandoc failed to import or thrown an error while converting" - " README.md to RST: %r .md version will be used as is" % exc - ) - long_description = open(README).read() - +with open("README.md", "r") as fh: + long_description = fh.read() setup( name="remodnav", @@ -42,6 +29,8 @@ def get_version(): version=version, description="robust eye movement detection for natural viewing", long_description=long_description, + long_description_content_type="text/markdown", + url="https://github.com/psychoinformatics-de/remodnav", packages=[pkg for pkg in find_packages('.') if pkg.startswith('remodnav')], install_requires=[ 'numpy', @@ -49,11 +38,6 @@ def get_version(): 'statsmodels', 'matplotlib', ], - extras_require={ - 'devel-docs': [ - # used for converting README.md -> .rst for long_description - 'pypandoc', - ]}, entry_points = { 'console_scripts': ['remodnav=remodnav:main'], },