Changeset 2735 for trunk

Show
Ignore:
Timestamp:
08/28/2008 08:49:08 AM (4 months ago)
Author:
guyer
Message:

More robust mechanism for finding FiPy's setuptools Distribution?

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/FiPy.egg-info/SOURCES.txt

    r2731 r2735  
    271271examples/phase/missOrientation/test.py 
    272272fipy/__init__.py 
    273 fipy/__version__.py 
    274273fipy/test.py 
    275274fipy/boundaryConditions/__init__.py 

  • trunk/fipy/__init__.py

    r2734 r2735  
    1 from pkg_resources import Requirement, resource_string, get_distribution 
     1from pkg_resources import get_distribution 
    22 
    3 FiPy = Requirement.parse("FiPy") 
     3FiPy = get_distribution(__name__) 
    44 
    5 __version__ = get_distribution(FiPy).version 
    6 __doc__ = resource_string(FiPy,"README.txt") 
     5__version__ = FiPy.version 
     6__doc__ = FiPy.get_metadata("PKG-INFO") 
    77__docformat__ = 'restructuredtext' 
    88 

  • trunk/setup.py

    r2731 r2735  
    77 #  FILE: "setup.py" 
    88 #                                    created: 4/6/04 {1:24:29 PM}  
    9  #                                last update: 8/27/08 {2:58:35 PM}  
     9 #                                last update: 8/28/08 {9:08:40 AM}  
    1010 #  Author: Jonathan Guyer <guyer@nist.gov> 
    1111 #  Author: Daniel Wheeler <daniel.wheeler@nist.gov> 
    … …  
    736736        test_suite="fipy.test._suite", 
    737737        packages = find_packages(exclude=["examples", "examples.*", "utils", "utils.*"]), 
    738         package_data={ 
    739             '': ['../DISCLAIMER.txt', 
    740                  '../LICENSE.txt', 
    741                  '../README.txt'], 
    742         }, 
    743738        classifiers = [ 
    744739            'Development Status :: 5 - Production/Stable',