Ticket #9828: 0_fix_setup.patch

File 0_fix_setup.patch, 1.3 KB (added by robertwb, 12 years ago)
  • setup.py

    # HG changeset patch
    # User Robert Bradshaw <robertwb@math.washington.edu>
    # Date 1284628728 25200
    # Node ID ae0f8252b44f9176e4ddfcda9acf9b8d397dc70a
    # Parent  5b338f2e484f2065d3d30d47bc204d6e9ed13d12
    Fix setup.py for new Cython.
    
    diff -r 5b338f2e484f -r ae0f8252b44f setup.py
    a b  
    464464###### Dependency checking
    465465#############################################
    466466
    467 CYTHON_INCLUDE_DIRS=[ SAGE_LOCAL + '/lib/python/site-packages/Cython/Includes/' ]
     467CYTHON_INCLUDE_DIRS=[
     468    SAGE_LOCAL + '/lib/python/site-packages/Cython/Includes/',
     469    SAGE_LOCAL + '/lib/python/site-packages/Cython/Includes/Deprecated/',
     470]
    468471
    469472# matches any dependency
    470473import re
     
    574577                        deps.add(new_path)
    575578                        found_include = True
    576579                        break
     580                    new_path = os.path.normpath(idir + base_dependency_name[:-4] + "/__init__.pxd")
     581                    if os.path.exists(new_path):
     582                        deps.add(new_path)
     583                        found_include = True
     584                        break
    577585                # so we really couldn't find the dependency -- raise
    578586                # an exception.
    579587                if not found_include: