jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge branch 'issue314' into devel

Browse source
This commit is contained in:
John Evans 2015-01-08 13:25:04 -05:00
commit 7b1522bb0e
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
glymur/test/fixtures.py
View file

@ -2,7 +2,6 @@
Test fixtures common to more than one test point.
"""
import os
import platform
import re
import sys
import textwrap
@ -34,14 +33,6 @@ elif re.match('1.[0-6]', six.__version__) is not None:
WARNING_INFRASTRUCTURE_ISSUE = True
msg = "Cannot run test with version {0} of python-six"
WARNING_INFRASTRUCTURE_MSG = msg.format(six.__version__)
elif ((re.match('1.8', six.__version__) is not None) and
(sys.platform.startswith('linux')) and
(platform.linux_distribution() == ('LinuxMint', '17', 'qiana'))):
WARNING_INFRASTRUCTURE_ISSUE = True
linux_distribution = platform.linux_distribution()
msg = "Cannot run test with version {0} of python-six on {1}"
WARNING_INFRASTRUCTURE_MSG = msg.format(six.__version__,
platform.linux_distribution)
# Cannot reopen a named temporary file in windows.
WINDOWS_TMP_FILE_MSG = "cannot use NamedTemporaryFile like this in windows"