Update to depend on data_logger v0.4 (and bump to v0.3).

diff --git a/piezo/__init__.py b/piezo/__init__.py
index 4a490d76c5ea1273de3982d69c2a515d2ca64af2..25e84697430dde1808c1af6f05ea9c81581d35a8 100644 (file)
--- a/piezo/__init__.py
+++ b/piezo/__init__.py
@@ -21,4 +21,4 @@
 # write to Trevor King, Drexel University, Physics Dept., 3141 Chestnut St.,
 # Philadelphia PA 19104, USA.
 
-VERSION = "0.2"
+__version__ = '0.3'

diff --git a/piezo/z_piezo.py b/piezo/z_piezo.py
index f2d948842cce03c408f4113686353f47028086dc..42e157227df80ad73fd69a4bc8c4e4008515cfbe 100644 (file)
--- a/piezo/z_piezo.py
+++ b/piezo/z_piezo.py
@@ -17,7 +17,7 @@ There are a few globals controlling the behavior of the entire module.
     the figure number for z_piezo pylab figures will be this number + {0,1,..}
   LOG_RAMPS (default False)
     save the input and output of any ramps to the LOG_DIR directory
-  LOG_DIR = '$DEFAULT$/z_piezo'
+  LOG_DIR = '${DEFAULT}/z_piezo'
     where the ramp logs are saved to
   DEFAULT_ZP_CHAN (default 0)
     output channel controlling the z piezo
@@ -32,7 +32,7 @@ TEXT_VERBOSE = False
 PYLAB_INTERACTIVE_VERBOSE = False
 BASE_FIG_NUM = 50
 LOG_RAMPS = False
-LOG_DIR = '$DEFAULT$/z_piezo'
+LOG_DIR = '${DEFAULT}/z_piezo'
 
 # Hackish defaults for the calibcant.config module
 DEFAULT_GAIN = 20 # Vpiezo / Voutput

diff --git a/piezo/z_piezo_utils.py b/piezo/z_piezo_utils.py
index 29002e39c3242b27c6d3fcefd5750eca2a45aac0..692b9fb197e3d3581c67406bf73f5a9372d53f40 100644 (file)
--- a/piezo/z_piezo_utils.py
+++ b/piezo/z_piezo_utils.py
@@ -3,7 +3,7 @@ PYLAB_INTERACTIVE = True
 PYLAB_VERBOSE = False
 BASE_FIG_NUM = 60
 LOG_DATA = True
-LOG_DIR = '$DEFAULT$/z_piezo_utils'
+LOG_DIR = '${DEFAULT}/z_piezo_utils'
 
 NULL_STEPS_BEFORE_SINGLE_PT_SWEEP = False
 SLEEP_DURING_SURF_POS_AQUISITION = False # doesn't help

diff --git a/setup.py b/setup.py
index 1ffb1d80bc74a9a6afff8debd6ad0623ca51bcbb..5f8cae57c89c0d32ae98fc32cc15162ee8da5587 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -36,16 +36,16 @@ if version < '2.2.3':
     DistributionMetadata.download_url = None
 
 import piezo
-VERSION = piezo.VERSION
+__version__ = piezo.__version__
 
 doclines = __doc__.split("\n")
 
 setup(name="piezo",
-      version=VERSION,
+      version=__version__,
       maintainer="W. Trevor King",
       maintainer_email="wking@drexel.edu",
       url = "http://www.physics.drexel.edu/~wking/code/python/",
-      download_url = "http://www.physics.drexel.edu/~wking/code/python/piezo-%s.tar.gz" % VERSION,
+      download_url = "http://www.physics.drexel.edu/~wking/code/python/piezo-%s.tar.gz" % __version__,
       license = "GNU General Public License (GPL)",
       platforms = ["all"],
       description = doclines[0],
@@ -57,7 +57,7 @@ setup(name="piezo",
         "http://www.physics.drexel.edu/~wking/code/python/"
         ],
       install_requires = ['pycomedi >= 0.2', 
-                          'data_logger >= 0.2',
+                          'data_logger >= 0.4',
                           'curses_check_for_keypress'],
       )