From f50480ef6ba2427c396a2381db559488eface2d4 Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Thu, 16 Apr 2015 12:36:53 +0100
Subject: [PATCH] Updating version number for pypi package, fixing some issues
with distribution
---
pykat/__init__.py | 2 +-
pykat/finesse.py | 3 ++-
pykat/optics/knm.py | 1 -
pykat/optics/maps.py | 2 +-
requirements.txt | 1 -
setup.py | 6 +++---
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pykat/__init__.py b/pykat/__init__.py
index f91c978..c4a01af 100644
--- a/pykat/__init__.py
+++ b/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
diff --git a/pykat/finesse.py b/pykat/finesse.py
index b9dc5cb..d3ae8f9 100644
--- a/pykat/finesse.py
+++ b/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:
diff --git a/pykat/optics/knm.py b/pykat/optics/knm.py
index 4ecd9b6..1579ac5 100644
--- a/pykat/optics/knm.py
+++ b/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
diff --git a/pykat/optics/maps.py b/pykat/optics/maps.py
index d96ae12..86b2e06 100644
--- a/pykat/optics/maps.py
+++ b/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
diff --git a/requirements.txt b/requirements.txt
index 1ec8c6d..4dce560 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,2 @@
numpy >= 1.6.2
flask >= 0.10.1
-progressbar >= 2.2
diff --git a/setup.py b/setup.py
index 83bf575..3b048ce 100644
--- a/setup.py
+++ b/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',
--
GitLab