Merge pull request #40 from CroatianMeteorNetwork/dev

Merge in Dev bugfixes

FF_bin_suite.py

@@ -28,11 +28,7 @@
 import six
 
 import numpy as np
-
-try:
-    import pyfits
-except:
-    import astropy.io.fits as pyfits
+import astropy.io.fits as pyfits
 
 from PIL import Image as img
 from PIL import ImageFont

README.md

@@ -13,13 +13,12 @@ CMN_binViewer came into existence during the second part of August 2014, as a re
 
 **Installing Windows EXE**
 
-Note: the installer will remove any existing version firs. This is to avoid unexpected DLL errors 
+Note: the installer will remove any existing version first. This is to avoid unexpected DLL errors 
 due to updates in python or windows DLLs. 
 
-Latest Windows x64 build (recommended): https://www.dropbox.com/s/4eutahlxojrkvsa/CMN_binViewer-setup64.exe?dl=0
-
-Latest Windows x86 build (legacy): https://www.dropbox.com/s/o6jn1ecsl7trdxk/CMN_binViewer-setup32.exe?dl=0
+Latest Windows builds: https://github.com/CroatianMeteorNetwork/cmn_binviewer/releases
 
+Note that the 32-bit Windows package is legacy and unmaintained.
 
 ## Installing on Raspberry Pi
 

requirements.txt

@@ -4,7 +4,6 @@
 astropy
 numpy
 pillow
-# wxPython
 tk
 six
 scipy

setup.py

@@ -4,7 +4,7 @@
 # Dependencies are automatically detected, but it might need fine tuning.
 includefiles = ['gifsicle.exe', 'noimage.bin', 'config.ini', 'icon.ico', 'changelog.md']
 
-exclude_libs = ['_ssl', 'pyreadline', 'doctest','optparse', 'matplotlib', "BaseHTTPServer", "SocketServer", "dateutil", "httplib", "itertools", "mpl_toolkits", "numpy.f2py", "pydoc_data", "urllib2", "zipimport", "scipy.sparse.linalg.eigen.arpack", "scipy.sparse._sparsetools", 'scipy']
+exclude_libs = ['pyreadline', 'doctest','optparse', 'matplotlib', "BaseHTTPServer", "SocketServer", "dateutil", "httplib", "itertools", "mpl_toolkits", "numpy.f2py", "pydoc_data", "urllib2", "zipimport", "scipy.sparse.linalg.eigen.arpack", "scipy.sparse._sparsetools", 'scipy']
 
 build_exe_options = {"packages": ["numpy.core", "numpy.lib"], "optimize": 0, 'include_files':includefiles, "excludes":exclude_libs, "include_msvcr":True}