From f98056f0a437f3fcbc2a7f0a7fd6a8f2627377a1 Mon Sep 17 00:00:00 2001
From: Andreas Freise <adf@star.bham.ac.uk>
Date: Tue, 14 Apr 2015 22:48:51 +0100
Subject: [PATCH] uploading a partly fixed setup.py
---
pykat/components.py | 4 ++--
pykat/finesse.py | 5 ++---
setup.py | 6 +++---
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pykat/components.py b/pykat/components.py
index 42d63af..dbd95a2 100644
--- a/pykat/components.py
+++ b/pykat/components.py
@@ -35,6 +35,7 @@ from pykat.SIfloat import *
from pykat.param import Param, AttrParam
import weakref
import pykat.exceptions as pkex
+from copy import deepcopy
next_component_id = 1
@@ -108,8 +109,7 @@ class Component(object):
# store a unique ID for this component
global next_component_id
self.__id = next_component_id
- next_component_id += 1
-
+ next_component_id += 1
def __deepcopy__(self, memo):
"""
diff --git a/pykat/finesse.py b/pykat/finesse.py
index 0a61496..9b46914 100644
--- a/pykat/finesse.py
+++ b/pykat/finesse.py
@@ -428,10 +428,9 @@ class kat(object):
# kat objects share the same class definition they also have the
# same properties regardless of whether they have the actual
# object added to it. So we create an instance specific class.
- return object.__new__(type(pykat.finesse.kat.__name__, (pykat.finesse.
- kat,), {}), *args, **kwargs)
+ return object.__new__(type(pykat.finesse.kat.__name__, (pykat.finesse.kat,), {}), *args, **kwargs)
+
def __init__(self, kat_file=None, kat_code=None, katdir="", katname="", tempdir=None, tempname=None):
-
self.scene = None # scene object for GUI
self.verbose = True
self.__blocks = OrderedDict() # dictionary of blocks that are used
diff --git a/setup.py b/setup.py
index c599caa..83bf575 100644
--- a/setup.py
+++ b/setup.py
@@ -14,12 +14,12 @@ setup(
version=pykat.__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.utilities','pykat.utilities.optics'],
+ packages=['pykat','pykat.gui','pykat.gui.resources','pykat.testing','pykat.testing.web','pykat.math','pykat.optics', 'pykat.external', 'pykat.tools'],
url='http://pypi.python.org/pypi/PyKat/',
license='GPL v2',
description='Python interface and tools for FINESSE',
long_description=open('README.rst').read(),
install_requires=REQUIREMENTS,
- package_data={'': ['utilities/greedypoints/*.txt']},
+ package_data={'': ['optics/greedypoints/*.txt']},
include_package_data=True
-)
\ No newline at end of file
+)
--
GitLab