Changeset 295

Show
Ignore:
Timestamp:
10/03/08 14:24:11 (2 months ago)
Author:
xi
Message:

Dropped tests from the source distribution since LibYAML bindings do not pass them; updated README and announcement.msg; renamed 'yaml.libyaml' to 'yaml.with_libyaml'.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • pyyaml/trunk/MANIFEST.in

    r290 r295  
    11include README LICENSE setup.py 
    22recursive-include examples *.py *.cfg *.yaml 
    3 recursive-include tests *.py 
    4 recursive-include tests/data * 
     3#recursive-include tests *.py 
     4#recursive-include tests/data * 

  • pyyaml/trunk/Makefile

    r285 r295  
    1818        ${PYTHON} setup.py --with-libyaml build -f ${PARAMETERS} 
    1919 
    20 install: build 
     20install: 
    2121        ${PYTHON} setup.py install ${PARAMETERS} 
    2222 
    23 installext: buildext 
     23installext: 
    2424        ${PYTHON} setup.py --with-libyaml install ${PARAMETERS} 
    2525 
    …… 
    3030        ${PYTHON} tests/test_build_ext.py ${TEST} 
    3131 
    32 dist: buildext 
     32dist: 
    3333        ${PYTHON} setup.py --with-libyaml sdist --formats=zip,gztar 
    3434 

  • pyyaml/trunk/README

    r279 r295  
    33To install, type 'python setup.py install'. 
    44 
    5 To build and install PyYAML with LibYAML bindings, type 
    6 'python setup.py --with-libyaml install'. 
    7 Then you may use a fast LibYAML-based parser and emitter as follows: 
     5By default, the setup.py script checks whether LibYAML is installed 
     6and if so, builds and installs LibYAML bindings.  To skip the check 
     7and force installation of LibYAML bindings, add the option '--with-libyaml': 
     8'python setup.py --with-libyaml install'.  To disable the check and 
     9skip building and installing LibYAML bindings, use '--without-libyaml': 
     10'python setup.py --without-libyaml install'. 
     11 
     12When LibYAML bindings are installed, you may use a fast LibYAML-based 
     13parser and emitter as follows: 
    814 
    915    >>> yaml.load(stream, Loader=yaml.CLoader) 

  • pyyaml/trunk/announcement.msg

    r290 r295  
    1515======= 
    1616 
    17 * Fixed a dot '.' character being recognized as !!float. 
    18 * Fixed exceptions produced by LibYAML bindings. 
     17* setup.py checks whether LibYAML is installed and if so, builds 
     18  and installs LibYAML bindings.  To force or disable installation 
     19  of LibYAML bindings, use '--with-libyaml' or '--without-libyaml' 
     20  respectively. 
     21* Building LibYAML bindings no longer requires Pyrex installed. 
    1922* 'yaml.load()' raises an exception if the input stream contains 
    2023  more than one YAML document. 
    21 * Improved compatibility with Python 2.3. 
    22 * Use setuptools for setup.py.  If you want to build optional LibYAML 
    23   bindings, run 'python setup.py --with-libyaml install'.  Building 
    24   LibYAML bindings no longer requires PyRex installed. 
     24* Fixed exceptions produced by LibYAML bindings. 
     25* Fixed a dot '.' character being recognized as !!float. 
     26* Fixed Python 2.3 compatibility issue in constructing !!timestamp values. 
    2527* Windows binary packages are built against the LibYAML stable branch. 
    26 * Added an attribute 'yaml.__version__' and a flag 'yaml.__libyaml__'. 
     28* Added attributes 'yaml.__version__' and  'yaml.__with_libyaml__'. 
    2729 
    2830 

  • pyyaml/trunk/lib/yaml/__init__.py

    r282 r295  
    1313try: 
    1414    from cyaml import * 
    15     __libyaml__ = True 
     15    __with_libyaml__ = True 
    1616except ImportError: 
    17     __libyaml__ = False 
     17    __with_libyaml__ = False 
    1818 
    1919def scan(stream, Loader=Loader): 

  • pyyaml/trunk/setup.py

    r294 r295  
    257257        cmdclass={ 
    258258            'build_ext': build_ext, 
    259             'test': test, 
     259#            'test': test, 
    260260        }, 
    261261    )