Skip to content

Bugfix/dapcleanup #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Feb 22, 2011
Merged

Bugfix/dapcleanup #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ include doc/make.py
include doc/conf.py
include doc/index.rst
recursive-include geos-3.2.0 *
recursive-include lib/dap *
recursive-include lib/httplib2 *
recursive-include lib/dbflib *
recursive-include lib/shapelib *
Expand Down
34 changes: 0 additions & 34 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,49 +106,15 @@ def checkversion(GEOS_dir):
import ConfigParser
config = ConfigParser.SafeConfigParser()
config.read("setup.cfg")
try: options['provide_pydap'] = config.getboolean("provide_packages", "pydap")
except: options['provide_pydap'] = 'auto'
try: options['provide_httplib2'] = config.getboolean("provide_packages", "httplib2")
except: options['provide_httplib2'] = 'auto'
try: options['provide_pyshapelib'] = config.getboolean("provide_packages", "pyshapelib")
except: options['provide_pyshapelib'] = 'auto'
else:
options['provide_pydap'] = 'auto'
options['provide_httplib2'] = 'auto'
options['provide_pyshapelib'] = 'auto'


provide_pydap = options['provide_pydap']
if provide_pydap == 'auto': # install pydap stuff if not already available.
# only the client is installed (not the server).
__dapversion__ = None
print 'checking to see if required version of pydap installed ..'
try:
from dap.lib import __version__ as __dapversion__
except ImportError:
print 'pydap not installed, client will be installed'
packages = packages + ['dap','dap.util','dap.parsers']
package_dirs['dap'] = os.path.join('lib','dap')
else:
print 'pydap installed, checking version ...'
# install dap client anyway if installed version is older than
# version provided here.
if __dapversion__ is not None:
__dapversion__ = [repr(v)+'.' for v in __dapversion__]
__dapversion__ = ''.join(__dapversion__)[:-1]
if __dapversion__ < '2.2.6.2':
print 'required version of pydap not installed, client will be installed'
packages = packages + ['dap','dap.util','dap.parsers']
package_dirs['dap'] = os.path.join('lib','dap')
else:
print 'pydap version OK, will not be installed'
elif provide_pydap: # force install of pydap stuff.
print 'forcing install of included pydap client'
packages = packages + ['dap','dap.util','dap.parsers']
package_dirs['dap'] = os.path.join('lib','dap')
else:
print 'will not install pydap'

provide_httplib2 = options['provide_httplib2']
if provide_httplib2 == 'auto':
print 'checking to see if httplib2 installed ..'
Expand Down