Changeset 706

Timestamp:

08/11/13 16:52:39 (3 years ago)

Author:

mmckerns

Message:

moved mystic.cache to new subpackage klepto; updated LICENSE file

Location:

mystic

Files:

• LICENSE (modified) (2 diffs)
• _math/rounding.py (deleted)
• cache/__init__.py (modified) (1 diff)
• cache/_cache.py (deleted)
• cache/_namedtuple.py (deleted)
• cache/archives.py (deleted)
• cache/keymaps.py (deleted)
• cache/safe.py (deleted)
• setup.py (modified) (6 diffs)
• tests/test_cache.py (deleted)
• tests/test_cache_info.py (deleted)
• tests/test_rounding.py (deleted)

mystic/LICENSE

@@ -1 @@
-This software is part of the open-source DANSE project at the California
+This software is part of the open-source mystic project at the California
 Institute of Technology, and is available subject to the conditions and
 terms laid out below. By downloading and using this software you are
@@ -32 +32 @@
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Copyright (c) 2012 California Institute of Technology. All rights reserved.
+Copyright (c) 2013 California Institute of Technology. All rights reserved.
 

mystic/cache/__init__.py

@@ -1 @@
-from _cache import *
-import safe
-import archives
-import keymaps
+# backward compatability
+from klepto import lru_cache, lfu_cache, mru_cache
+from klepto import rr_cache, inf_cache, no_cache
+
+# end of file

mystic/setup.py

@@ -155 +155 @@
     - sympy, version >= 0.6.7
     - dill, version >= 0.2a.dev
+    - klepto, version >= 0.1a.dev
 
 Optional requirements::
@@ -174 +175 @@
 Many of the included examples are standard optimization test problems.
 
-Instructions on building a new model are in `mystic.models.abstract_model`.
+Instr1ctions on building a new model are in `mystic.models.abstract_model`.
 Mystic provides base classes for two types of models::
 
@@ -302 +303 @@
 sympy_version = '>=0.6.7'
 dill_version = '>=0.2a.dev'
+klepto_version = '>=0.1a.dev'
 scipy_version = '>=0.6.0'
 matplotlib_version = '>=0.91'
@@ -308 +310 @@
       zip_safe=True,
       dependency_links = ['http://dev.danse.us/packages/'],
-      install_requires = ('numpy%s', 'sympy%s', 'dill%s'),
-""" % (numpy_version, sympy_version, dill_version)
+      install_requires = ('numpy%s', 'sympy%s', 'klepto%s', 'dill%s'),
+""" % (numpy_version, sympy_version, klepto_version, dill_version)
 
 # add the scripts, and close 'setup' call
@@ -327 +329 @@
     import numpy
     import sympy
+    import klepto
     import dill
     #import scipy
@@ -335 +338 @@
     print "    numpy %s" % numpy_version
     print "    sympy %s" % sympy_version
+    print "    klepto %s" % klepto_version
     print "    dill %s" % dill_version
     print "    scipy %s (optional)" % scipy_version