summaryrefslogtreecommitdiff
path: root/conftest.py
diff options
context:
space:
mode:
Diffstat (limited to 'conftest.py')
-rw-r--r--conftest.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/conftest.py b/conftest.py
index c4e4fec5..96431a57 100644
--- a/conftest.py
+++ b/conftest.py
@@ -20,10 +20,6 @@ def pytest_addoption(parser):
def pytest_configure(config):
config.addinivalue_line("markers", "integration: indicate integration tests")
- if config.option.integration:
- # Assume unit tests and flake already run
- config.option.flake8 = False
-
collect_ignore = [
'tests/manual_test.py',