Bumped to version 0.4.

Updated to depend on newly packaged piezo package.

diff --git a/calibcant/bump.py b/calibcant/bump.py
index 9c12a94af2eb6f01a772ddecd85e9f57a9756170..04e8b195366ae1b4c14c5186cad9b8e41be8b60a 100644 (file)
--- a/calibcant/bump.py
+++ b/calibcant/bump.py
@@ -2,7 +2,7 @@
 #
 # calibcant - tools for thermally calibrating AFM cantilevers
 #
 #
 # calibcant - tools for thermally calibrating AFM cantilevers
 #

-# Copyright (C) 2007,2008, William Trevor King
+# Copyright (C) 2007-2009 William Trevor King

 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as


@@ -74,7 +74,7 @@ A family name without any _* extension (e.g. bump()),
 import numpy
 import time 
 import data_logger
 import numpy
 import time 
 import data_logger

-import z_piezo_utils
+import piezo.z_piezo_utils as z_piezo_utils

 import FFT_tools
 import linfit
 from calibcant_bump_analyze import bump_analyze
 import FFT_tools
 import linfit
 from calibcant_bump_analyze import bump_analyze

diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py
index 7986ccb43c4ad727f7d1f26ce648ff306d83dd12..a485bf4dc524edab8a5b9c537c63d34341ddf4c7 100755 (executable)
--- a/calibcant/calibrate.py
+++ b/calibcant/calibrate.py
@@ -2,7 +2,7 @@
 #
 # calibcant - tools for thermally calibrating AFM cantilevers
 #
 #
 # calibcant - tools for thermally calibrating AFM cantilevers
 #

-# Copyright (C) 2007,2008, William Trevor King
+# Copyright (C) 2007-2009 William Trevor King

 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as


@@ -104,7 +104,7 @@ which make automating the calibration procedure more straightforward.
 
 import numpy
 import time 
 
 import numpy
 import time 

-import z_piezo_utils
+import piezo.z_piezo_utils as z_piezo_utils

 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 import FFT_tools
 from splittable_kwargs import splittableKwargsFunction, \
     make_splittable_kwargs_function
 import FFT_tools

diff --git a/calibcant/common.py b/calibcant/common.py
index 1e8ff7137e3c839f6a4ed3496842428099bc59d5..590d2b7bf5272b6d3b597795fec862406279ade2 100644 (file)
--- a/calibcant/common.py
+++ b/calibcant/common.py
@@ -1,6 +1,6 @@
 # calibcant - tools for thermally calibrating AFM cantilevers
 #
 # calibcant - tools for thermally calibrating AFM cantilevers
 #

-# Copyright (C) 2007,2008, William Trevor King
+# Copyright (C) 2007-2009 William Trevor King

 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as


@@ -23,7 +23,7 @@
 
 import config
 
 
 import config
 

-VERSION="0.3"
+VERSION="0.4"

 
 # handle extra verbose input modules, only imported if we need them
 _flush_plot = None
 
 # handle extra verbose input modules, only imported if we need them
 _flush_plot = None

diff --git a/calibcant/config.py b/calibcant/config.py
index c6648dc4a09f8606c8be1e6edb6283c3cd1dc547..131651db760b0ac9641794533bd7d3797d90b4fd 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -1,6 +1,6 @@
 # calibcant - tools for thermally calibrating AFM cantilevers
 #
 # calibcant - tools for thermally calibrating AFM cantilevers
 #

-# Copyright (C) 2007,2008, William Trevor King
+# Copyright (C) 2007-2009 William Trevor King

 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as


@@ -24,7 +24,7 @@
 """Define some variables to configure the package for a particular lab
 and workflow."""
 
 """Define some variables to configure the package for a particular lab
 and workflow."""
 

-import z_piezo
+import piezo.z_piezo as z_piezo

 
 DEFAULT_TEMP = 22  # assume 22 deg C
 LOG_DATA = True  # quietly grab all real-world data and log to LOG_DIR
 
 DEFAULT_TEMP = 22  # assume 22 deg C
 LOG_DATA = True  # quietly grab all real-world data and log to LOG_DIR

diff --git a/setup.py b/setup.py
index 43318f7be5ba114ec19113c3e3322950e20aea28..a121de96e6a4ab67c63e947b3222f21bd3e6e8db 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,10 @@ setup(name="calibcant",
       classifiers = filter(None, classifiers.split("\n")),
       py_modules = ['ez_setup'],
       packages = find_packages(),
       classifiers = filter(None, classifiers.split("\n")),
       py_modules = ['ez_setup'],
       packages = find_packages(),

+      dependency_links = [
+        "http://www.physics.drexel.edu/~wking/code/python/"
+        ],
+      install_requires = ['piezo >= 0.1'],

       )
 
 # use packages to include subdirectory packages
       )
 
 # use packages to include subdirectory packages