From 37d5cda9252f992e57995d8cb62f168f9b5ed76a Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 17 Jun 2009 20:22:56 -0400 Subject: [PATCH] Bumped to version 0.4. Updated to depend on newly packaged piezo package. --- calibcant/bump.py | 4 ++-- calibcant/calibrate.py | 4 ++-- calibcant/common.py | 4 ++-- calibcant/config.py | 4 ++-- setup.py | 4 ++++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/calibcant/bump.py b/calibcant/bump.py index 9c12a94..04e8b19 100644 --- a/calibcant/bump.py +++ b/calibcant/bump.py @@ -2,7 +2,7 @@ # # 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 @@ -74,7 +74,7 @@ A family name without any _* extension (e.g. bump()), 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 diff --git a/calibcant/calibrate.py b/calibcant/calibrate.py index 7986ccb..a485bf4 100755 --- a/calibcant/calibrate.py +++ b/calibcant/calibrate.py @@ -2,7 +2,7 @@ # # 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 @@ -104,7 +104,7 @@ which make automating the calibration procedure more straightforward. 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 diff --git a/calibcant/common.py b/calibcant/common.py index 1e8ff71..590d2b7 100644 --- a/calibcant/common.py +++ b/calibcant/common.py @@ -1,6 +1,6 @@ # 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 @@ -23,7 +23,7 @@ import config -VERSION="0.3" +VERSION="0.4" # 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 c6648dc..131651d 100644 --- a/calibcant/config.py +++ b/calibcant/config.py @@ -1,6 +1,6 @@ # 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 @@ -24,7 +24,7 @@ """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 diff --git a/setup.py b/setup.py index 43318f7..a121de9 100644 --- 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(), + dependency_links = [ + "http://www.physics.drexel.edu/~wking/code/python/" + ], + install_requires = ['piezo >= 0.1'], ) # use packages to include subdirectory packages -- 2.26.2