Update to piezo v0.3 (based on data_logger 0.4) and bump to v0.5.

diff --git a/calibcant/__init__.py b/calibcant/__init__.py
index 516334bc242bb7395fcffd80cc0e4cfb9e6b1ab7..c890f4f1579cc777a38882fde7835cafc69d093c 100644 (file)
--- a/calibcant/__init__.py
+++ b/calibcant/__init__.py
@@ -18,4 +18,4 @@
 # License along with CalibCant.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-VERSION="0.4"
+__version__ = '0.5'

diff --git a/calibcant/bump.py b/calibcant/bump.py
index 9a2b701371e75ea2fc7c5ae535075d6efeb3a98f..08c4c36a1ce100dc8e312039f06c0dfa0c857e5e 100644 (file)
--- a/calibcant/bump.py
+++ b/calibcant/bump.py
@@ -79,7 +79,7 @@ from .bump_analyze import bump_analyze
 
 
 LOG_DATA = True  # quietly grab all real-world data and log to LOG_DIR
-LOG_DIR = '$DEFAULT$/calibrate_cantilever'
+LOG_DIR = '${DEFAULT}/calibrate_cantilever'
 
 TEXT_VERBOSE = True      # for debugging
 

diff --git a/calibcant/config.py b/calibcant/config.py
index 8df49cbb357298cc3cef60bf4a0e9d477b225021..aa2f0a2aaac17ad6683acf46d5295b4c9af4e903 100644 (file)
--- a/calibcant/config.py
+++ b/calibcant/config.py
@@ -26,7 +26,7 @@ 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
-LOG_DIR = '$DEFAULT$/calibrate_cantilever'
+LOG_DIR = '${DEFAULT}/calibrate_cantilever'
 GNUFIT_DATA_BASE='./calibrate_cantilever_fitdata'
 TEXT_VERBOSE = True      # for debugging
 GNUPLOT_VERBOSE = True   # turn on fit check plotting

diff --git a/setup.py b/setup.py
index 421b4878cd75b9deebf36182f82d20f8022aebbc..abfbe099265a864a27d3cf07b22e64a9aaaf60eb 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -34,16 +34,16 @@ if version < '2.2.3':
     DistributionMetadata.download_url = None
 
 import calibcant
-VERSION = calibcant.VERSION
+__version__ = calibcant.__version__
 
 doclines = __doc__.split("\n")
 
 setup(name="calibcant",
-      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/calibcant-%s.tar.gz" % VERSION,
+      download_url = "http://www.physics.drexel.edu/~wking/code/python/calibcant-%s.tar.gz" % __version__,
       license = "GNU General Public License (GPL)",
       platforms = ["all"],
       description = doclines[0],
@@ -53,7 +53,7 @@ setup(name="calibcant",
       dependency_links = [
         "http://www.physics.drexel.edu/~wking/code/python/"
         ],
-      install_requires = ['piezo >= 0.1'],
+      install_requires = ['piezo >= 0.3'],
       )
 
 # use packages to include subdirectory packages