Updating version number for pypi package, fixing some issues with distribution

pykat/__init__.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
-__version__ = "0.6.2"
+__version__ = "0.7.2"
 
 # This flag is used to switch on the gui features in pkat at import time
 USE_GUI = False

pykat/finesse.py

@@ -1265,7 +1265,8 @@ class kat(object):
                 return rtn[0]
             else:
                 return rtn
-            
+        except KeyboardInterrupt as ex:
+            print("Keyboard interrupt caught, stopped simulation.")
         except pkex.FinesseRunError as ex:
             pkex.PrintError("Error from Finesse:", ex)
         except pkex.BasePyKatException as ex:

pykat/optics/knm.py

@@ -330,7 +330,6 @@ def ROM_HG_knm(weights, mode_in, mode_out, q1, q2, q1y=None, q2y=None, cache=Non
             w_ij_Q3Q4 = cache["w_ij_Q3Q4"]
             w_ij_Q1Q2Q3Q4 = cache["w_ij_Q1Q2Q3Q4"]
         
-
         u_xy_nodes = np.outer(u_x_nodes, u_y_nodes)
 
         n_mod_2 = n % 2

pykat/optics/maps.py

@@ -128,9 +128,9 @@ class surfacemap(object):
                 
             elif "absorption" in self.type:
                 return np.sqrt(1.0 - data)
-                
             else:
                 raise BasePyKatException("Map type needs handling")
+                
         elif direction == "transmission":
             if "phase" in self.type:
                 k = math.pi * 2 / wavelength

requirements.txt

 numpy >= 1.6.2
 flask >= 0.10.1
-progressbar >= 2.2

setup.py

@@ -4,17 +4,17 @@ Created on Sun Jan 27 09:43:16 2013
 
 @author: Daniel
 """
-import pykat
+from pykat import __version__ as version
 from distutils.core import setup
 
 REQUIREMENTS = [i.strip() for i in open("requirements.txt").readlines()]
 
 setup(
     name='PyKat',
-    version=pykat.__version__,
+    version=version,
     author='Daniel Brown',
     author_email='ddb@star.sr.bham.ac.uk',
-    packages=['pykat','pykat.gui','pykat.gui.resources','pykat.testing','pykat.testing.web','pykat.math','pykat.optics', 'pykat.external', 'pykat.tools'],
+    packages=['pykat','pykat.testing','pykat.testing.web','pykat.maths','pykat.optics', 'pykat.external', 'pykat.tools'],
     url='http://pypi.python.org/pypi/PyKat/',
     license='GPL v2',
     description='Python interface and tools for FINESSE',