From 2e7f2703b35f1c1bc5325186d0fac912b2a58aa1 Mon Sep 17 00:00:00 2001
From: Stephan Seitz <stephan.seitz@fau.de>
Date: Tue, 21 Jan 2020 09:31:35 +0100
Subject: [PATCH] Auto-format conftest
---
conftest.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/conftest.py b/conftest.py
index c20bde409..3bbdefe7c 100644
--- a/conftest.py
+++ b/conftest.py
@@ -1,8 +1,8 @@
import os
import runpy
import sys
-import warnings
import tempfile
+import warnings
import nbformat
import pytest
@@ -34,7 +34,7 @@ def add_path_to_ignore(path):
collect_ignore = [os.path.join(SCRIPT_FOLDER, "doc", "conf.py"),
- os.path.join(SCRIPT_FOLDER, "pystencils", "opencl", "opencl.autoinit")]
+ os.path.join(SCRIPT_FOLDER, "pystencils", "opencl", "opencl.autoinit")]
add_path_to_ignore('pystencils_tests/benchmark')
add_path_to_ignore('_local_tmp')
@@ -83,8 +83,6 @@ for root, sub_dirs, files in os.walk('.'):
collect_ignore.append(f)
-
-
class IPythonMockup:
def run_line_magic(self, *args, **kwargs):
pass
--
GitLab