Merge branch 'develop'

README.md

-shallow-appify
-==============
+# shallow-appify
+
+## Introduction
 
 Converts any executable to a non-self-contained mac app bundle which depends on system libraries. Other converters often
 have problems when complex dependencies (e.g. PyQt) must be included. shallow-appify avoids these problems by
 referencing present system libraries.
 
+## Usage
 
-Usage
-=====
-
-    usage: shallow-appify.py [-h] [-d EXECUTABLE_ROOT_PATH]
-                             [-e ENVIRONMENT_VARS [ENVIRONMENT_VARS ...]]
-                             [-i ICON_PATH] [-g GROUP] [-n HIDDEN] [-o APP_PATH]
-                             [-v VERSION_STRING] [--conda CONDA_REQ_FILE]
-                             [--conda-channels CONDA_CHANNELS [CONDA_CHANNELS ...]]
-                             [--extension-makefile EXTENSION_MAKEFILE]
-                             executable_path
+    usage: shallow-appify [-h] [-d EXECUTABLE_ROOT_PATH]
+                          [-e ENVIRONMENT_VARS [ENVIRONMENT_VARS ...]] [-i ICON_PATH]
+                          [-g GROUP] [-n] [-o APP_PATH] [-v VERSION_STRING]
+                          [--conda CONDA_REQ_FILE]
+                          [--conda-channels CONDA_CHANNELS [CONDA_CHANNELS ...]]
+                          [--extension-makefile EXTENSION_MAKEFILE]
+                          executable_path
 
     Creates a runnable application for Mac OS X with references to system
     libraries. The result is a NON-self-contained app bundle.
@@ -40,8 +39,7 @@ Usage
       -g GROUP, --group GROUP
                             Developer group name that is saved to the internal app
                             plist.
-      -n HIDDEN, --hidden HIDDEN
-                            Hides the app icon in the dock when given.
+      -n, --hidden          Hides the app icon in the dock when given.
       -o APP_PATH, --output APP_PATH
                             Sets the path the app will be saved to.
       -v VERSION_STRING, --version VERSION_STRING

setup.py

@@ -14,13 +14,17 @@ from shallow_appify._version import __version__
 
 def get_long_description_from_readme(readme_filename='README.md'):
     rst_filename = '{}.rst'.format(os.path.splitext(os.path.basename(readme_filename))[0])
+    created_tmp_rst = False
     if not os.path.isfile(rst_filename):
-        subprocess.check_call(['pandoc', readme_filename, '-t', 'rst', '-o', rst_filename])
-        created_tmp_rst = True
-    else:
-        created_tmp_rst = False
-    with codecs.open(rst_filename, 'r', 'utf-8') as readme_file:
-        long_description = readme_file.read()
+        try:
+            subprocess.check_call(['pandoc', readme_filename, '-t', 'rst', '-o', rst_filename])
+            created_tmp_rst = True
+        except (OSError, subprocess.CalledProcessError):
+            pass
+    long_description = None
+    if os.path.isfile(rst_filename):
+        with codecs.open(rst_filename, 'r', 'utf-8') as readme_file:
+            long_description = readme_file.read()
     if created_tmp_rst:
         os.remove(rst_filename)
     return long_description

shallow_appify/_version.py

@@ -5,5 +5,5 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 
-__version_info__ = (0, 4, 0)
+__version_info__ = (0, 4, 1)
 __version__ = '.'.join(map(str, __version_info__))