Commit d2821e3a authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 1.14~alpha1.48

parent 3e4986e6

PKG-INFO

+1 −2
Original line number Diff line number Diff line 
Metadata-Version: 1.0

Name: bd2k-python-lib

Version: 1.14a1.dev43

Version: 1.14a1.dev48

Summary: The BD2K Python module kitchen sink

Home-page: https://github.com/BD2KGenomics/bd2k-python-lib

Author: Hannes Schmidt

Author-email: hannes@ucsc.edu

License: UNKNOWN

Description-Content-Type: UNKNOWN

Description: UNKNOWN

Platform: UNKNOWN

setup.cfg

+3 −4
Original line number Diff line number Diff line 
[pytest]

python_files = *.py

addopts = --doctest-modules

[aliases]

test = pytest



[egg_info]

tag_build = .dev43

tag_build = .dev48

tag_date = 0

setup.py

+2 −26
Original line number Diff line number Diff line
@@ -16,36 +16,12 @@ kwargs = dict( 
    package_dir={ '': 'src' },

    packages=find_packages( 'src' ),

    install_requires=[ 'future' ],

    setup_requires=['pytest-runner'],

    tests_require=[

        'pytest==2.7.2',

        'pytest==3.5.0',

        'mock==1.0.1',

        'lockfile==0.11.0',

        'boto==2.38.0'],

    namespace_packages=[ 'bd2k' ] )



from setuptools.command.test import test as TestCommand





class PyTest( TestCommand ):

    user_options = [ ('pytest-args=', 'a', "Arguments to pass to py.test") ]



    def initialize_options( self ):

        TestCommand.initialize_options( self )

        self.pytest_args = [ ]



    def finalize_options( self ):

        TestCommand.finalize_options( self )

        self.test_args = [ ]

        self.test_suite = True



    def run_tests( self ):

        import pytest

        # Sanitize command line arguments to avoid confusing Toil code attempting to parse them

        sys.argv[ 1: ] = [ ]

        errno = pytest.main( self.pytest_args )

        sys.exit( errno )





kwargs[ 'cmdclass' ] = { 'test': PyTest }



setup( **kwargs )

src/bd2k/util/__init__.py

+2 −1
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ def ilen( it ): 
    """

    Return the number of elements in an iterable



    >>> ilen(xrange(0,100))

    >>> from builtins import range

    >>> ilen(range(0,100))

    100

    """

    return sum( 1 for _ in it )

src/bd2k/util/collections.py

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ def rindex( l, v ): 
    2

    >>> rindex( (0,1,0,1), 0 )

    2

    >>> rindex( xrange(3), 2 )

    >>> from builtins import range

    >>> rindex( range(3), 2 )

    2

    """

    try: