Changeset 3529

Show
Ignore:
Timestamp:
09/06/07 18:33:05 (1 year ago)
Author:
mscott
Message:

Merge #64 to trunk:

durus.connection

  • Remove side-effect from assert statement.

durus

  • Bump version to 3.7-schevo2

SchevoDurus

  • require Durus 3.7-schevo2

Schevo

  • rely on SchevoDurus >= 3.1a1dev-r3527, which in turn relies on Durus 3.7-schevo2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Durus/setup.py

    r3512 r3529  
    5454 
    5555    install_requires=[ 
    56     'Durus == 3.7-schevo1', 
     56    'Durus == 3.7-schevo2', 
    5757    ], 
    5858 

  • trunk/Schevo/setup.py

    r3512 r3529  
    8585    'Louie >= 1.0', 
    8686    'PasteScript >= 1.3.5', 
    87     'SchevoDurus == dev, >= 3.1a1dev-r3496', 
     87    'SchevoDurus == dev, >= 3.1a1dev-r3527', 
    8888    ], 
    8989 

  • trunk/thirdparty/Durus/CHANGES.txt

    r3485 r3529  
     13.7-schevo2: 
     2 
     3     * Bug fix when using Python in optimized mode. 
     4       See http://mail.mems-exchange.org/durusmail/durus-users/891/ 
     5 
    163.7-schevo1: 
    27 

  • trunk/thirdparty/Durus/INSTALL.txt

    r3485 r3529  
    1717latest version. 
    1818Untar the tarball with a command like this: 
    19     tar zvxf Durus-3.7-schevo1.tar.gz 
     19    tar zvxf Durus-3.7-schevo2.tar.gz 
    2020Move into the Durus source directory: 
    21     cd Durus-3.7-schevo1 
     21    cd Durus-3.7-schevo2 
    2222Here is the standard installation command, with the additional option 
    2323that creates a "durus.installed" file containing the list of installed 

  • trunk/thirdparty/Durus/LICENSE.txt

    r3485 r3529  
    1 CNRI OPEN SOURCE LICENSE AGREEMENT FOR Durus-3.7-schevo1 
     1CNRI OPEN SOURCE LICENSE AGREEMENT FOR Durus-3.7-schevo2 
    22 
    33IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.  BY COPYING, 
    4 INSTALLING OR OTHERWISE USING Durus-3.7-schevo1 SOFTWARE, YOU ARE DEEMED TO 
     4INSTALLING OR OTHERWISE USING Durus-3.7-schevo2 SOFTWARE, YOU ARE DEEMED TO 
    55HAVE AGREED TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS LICENSE 
    66AGREEMENT. 
    …… 
    99Initiatives, having an office at 1895 Preston White Drive, Reston, VA 
    101020191 ("CNRI"), and the Individual or Organization ("Licensee") 
    11 copying, installing or otherwise using Durus-3.7-schevo1 software in source 
    12 or binary form and its associated documentation ("Durus-3.7-schevo1"). 
     11copying, installing or otherwise using Durus-3.7-schevo2 software in source 
     12or binary form and its associated documentation ("Durus-3.7-schevo2"). 
    1313 
    14142. Subject to the terms and conditions of this License Agreement, CNRI 
    1515hereby grants Licensee a nonexclusive, royalty-free, world-wide 
    1616license to reproduce, analyze, test, perform and/or display publicly, 
    17 prepare derivative works, distribute, and otherwise use Durus-3.7-schevo1 
     17prepare derivative works, distribute, and otherwise use Durus-3.7-schevo2 
    1818alone or in any derivative version, provided, however, that CNRI's 
    1919License Agreement and CNRI's notice of copyright, i.e., "Copyright © 
    20202005 Corporation for National Research Initiatives; All Rights 
    21 Reserved" are retained in Durus-3.7-schevo1 alone or in any derivative 
     21Reserved" are retained in Durus-3.7-schevo2 alone or in any derivative 
    2222version prepared by Licensee. 
    2323 
    24243. In the event Licensee prepares a derivative work that is based on 
    25 or incorporates Durus-3.7-schevo1, or any part thereof, and wants to make 
     25or incorporates Durus-3.7-schevo2, or any part thereof, and wants to make 
    2626the derivative work available to others as provided herein, then 
    2727Licensee hereby agrees to include in any such work a brief summary of 
    28 the changes made to Durus-3.7-schevo1. 
     28the changes made to Durus-3.7-schevo2. 
    2929 
    30 4. CNRI is making Durus-3.7-schevo1 available to Licensee on an "AS IS" 
     304. CNRI is making Durus-3.7-schevo2 available to Licensee on an "AS IS" 
    3131basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR 
    3232IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND 
    3333DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS 
    34 FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF Durus-3.7-schevo1 WILL NOT 
     34FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF Durus-3.7-schevo2 WILL NOT 
    3535INFRINGE ANY THIRD PARTY RIGHTS. 
    3636 
    37375. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF 
    38 Durus-3.7-schevo1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR 
     38Durus-3.7-schevo2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR 
    3939LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING 
    40 Durus-3.7-schevo1, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE 
     40Durus-3.7-schevo2, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE 
    4141POSSIBILITY THEREOF. 
    4242 
    …… 
    5050Virginia, excluding Virginia's conflict of law 
    5151provisions. Notwithstanding the foregoing, with regard to derivative 
    52 works based on Durus-3.7-schevo1 that incorporate non-separable material 
     52works based on Durus-3.7-schevo2 that incorporate non-separable material 
    5353that was previously distributed under the GNU General Public License 
    5454(GPL), the law of the Commonwealth of Virginia shall govern this 
    …… 
    6161services of Licensee, or any third party. 
    6262 
    63 8. By copying, installing or otherwise using Durus-3.7-schevo1, Licensee 
     638. By copying, installing or otherwise using Durus-3.7-schevo2, Licensee 
    6464agrees to be bound by the terms and conditions of this License 
    6565Agreement. 

  • trunk/thirdparty/Durus/PKG-INFO

    r3485 r3529  
    11Metadata-Version: 1.0 
    22Name: Durus 
    3 Version: 3.7-schevo1 
     3Version: 3.7-schevo2 
    44Summary: A Python Object Database 
    55Home-page: http://www.mems-exchange.org/software/durus/ 

  • trunk/thirdparty/Durus/__init__.py

    r3460 r3529  
    44Copyright (c) Corporation for National Research Initiatives 2007. All Rights Reserved. 
    55""" 
    6 __version__ = '3.7-schevo1' 
     6__version__ = '3.7-schevo2' 

  • trunk/thirdparty/Durus/connection.py

    r3495 r3529  
    5959        self.root = self.get(ROOT_OID) 
    6060        if self.root is None: 
    61             assert ROOT_OID == self.new_oid() 
     61            new_oid = self.new_oid() 
     62            assert ROOT_OID == new_oid 
    6263            self.root = self.get_cache().get_instance( 
    6364                ROOT_OID, root_class or PersistentDict, self)