merge branch 'issue310' into devel

This commit is contained in:
John Evans 2015-01-01 22:18:45 -05:00
commit 48fdceda52

View file

@ -20,11 +20,13 @@ kwargs = {'name': 'Glymur',
'license': 'MIT',
'test_suite': 'glymur.test'}
instllrqrs = ['numpy>=1.4.1', 'lxml>=2.3.2']
install_requires = ['numpy>=1.7.0', 'lxml>=3.0.0']
test_requires = ['six>=1.7.0']
if sys.hexversion < 0x03030000:
instllrqrs.append('contextlib2>=0.4')
instllrqrs.append('mock>=1.0.1')
kwargs['install_requires'] = instllrqrs
install_requires.append('contextlib2>=0.4')
test_requires.append('mock>=1.0.1')
kwargs['install_requires'] = install_requires
kwargs['test_requires'] = test_requires
clssfrs = ["Programming Language :: Python",
"Programming Language :: Python :: 2.7",