correcting version logic

Author: samuelcolvin

.travis.yml

@@ -18,10 +18,10 @@ install:
 script:
 - coverage run --source=pydf setup.py test
 - flake8 pydf/
+- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then python setup.py check -rms; fi
 - python setup.py install
 - tests/check_file_permissions.py
 - python -c "import pydf; print(pydf.get_version())"
-- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then python setup.py check -rms; fi
 
 after_success:
 - ls -lha

README.rst

@@ -103,6 +103,11 @@ Changelog
 -  uprev wkhtmltopdf from **0.12.2 (beta)** to **0.12.4**.
 -  code cleanup
 
+0.21
+~~~~
+
+- correct permissions on wkhtmltopdf binary.
+
 .. |Build Status| image:: https://travis-ci.org/tutorcruncher/pydf.svg?branch=master
    :target: https://travis-ci.org/tutorcruncher/pydf
 .. |codecov.io| image:: https://codecov.io/github/tutorcruncher/pydf/coverage.svg?branch=master

pydf/__init__.py

@@ -1 +1,2 @@
 from .wkhtmltopdf import *  # noqa
+from .version import VERSION  # noqa

pydf/version.py

@@ -0,0 +1,3 @@
+from distutils.version import StrictVersion
+
+VERSION = StrictVersion('0.3.0')

pydf/wkhtmltopdf.py

@@ -1,8 +1,7 @@
 import os
 import subprocess
 from tempfile import NamedTemporaryFile
-
-__version__ = '0.3'
+from .version import VERSION
 
 
 def execute_wk(*args):
@@ -132,14 +131,12 @@ def get_version():
 
     :return: version string
     """
-    v = 'pydf version: %s\n' % __version__
     try:
         wk_version = _string_execute('-V')
     except Exception as e:
         # we catch all errors here to make sure we get a version no matter what
-        wk_version = 'Error: %s' % str(e)
-    v += 'wkhtmltopdf version: %s' % wk_version
-    return v
+        wk_version = '%s: %s' % (e.__class__.__name__, e)
+    return 'pydf version: %s\nwkhtmltopdf version: %s' % (VERSION, wk_version)
 
 
 def get_help():

setup.py

@@ -1,6 +1,7 @@
 import os
 from setuptools import setup
 from setuptools.command.install import install
+from pydf.version import VERSION
 
 description = 'PDF generation in python using wkhtmltopdf suitable for heroku'
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -19,7 +20,7 @@ def run(self):
 setup(
     name='python-pdf',
     cmdclass={'install': OverrideInstall},
-    version='0.23',
+    version=str(VERSION),
     description=description,
     long_description=long_description,
     author='Samuel Colvin',