Skip to content

Commit

Permalink
Fix linting issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffknupp committed Jul 23, 2017
1 parent e3cb9c1 commit 7b1cd8d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions pandas/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ def pytest_runtest_setup(item):
if 'network' in item.keywords and item.config.getoption("--skip-network"):
pytest.skip("skipping due to --skip-network")

if 'high_memory' in item.keywords and not item.config.getoption("--run-highmemory"):
pytest.skip("skipping high memory test since --run-highmemory was not set")
if 'high_memory' in item.keywords and not item.config.getoption(
"--run-highmemory"):
pytest.skip(
"skipping high memory test since --run-highmemory was not set")


# Configurations for all tests and all test modules
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/io/parser/test_parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ def test_bytes_exceed_2gb():
GH 16798
"""
csv = StringIO('strings\n' + '\n'.join(['x' * (1 << 20) for _ in range(2100)]))
csv = StringIO('strings\n' + '\n'.join(
['x' * (1 << 20) for _ in range(2100)]))
df = read_csv(csv, low_memory=False)
assert not df.empty

Expand Down

0 comments on commit 7b1cd8d

Please sign in to comment.