From 5b8d0d5bfc1bc77d486bf0325cb0a375a5a2b5d2 Mon Sep 17 00:00:00 2001
From: Martin Bauer <martin.bauer@fau.de>
Date: Thu, 11 Jul 2019 11:16:30 +0200
Subject: [PATCH] Import sorting with isort
---
.isort.cfg | 4 ++++
pystencils_walberla/__init__.py | 4 +++-
pystencils_walberla/cmake_integration.py | 2 +-
pystencils_walberla/codegen.py | 11 ++++++-----
pystencils_walberla/jinja_filters.py | 5 +++--
pystencils_walberla_tests/test_packinfo_generation.py | 3 ++-
pystencils_walberla_tests/test_walberla_gen.py | 4 +++-
7 files changed, 22 insertions(+), 11 deletions(-)
create mode 100644 .isort.cfg
diff --git a/.isort.cfg b/.isort.cfg
new file mode 100644
index 0000000..cbdece3
--- /dev/null
+++ b/.isort.cfg
@@ -0,0 +1,4 @@
+[settings]
+line_length=100
+balanced_wrapping=True
+multi_line_output=4
diff --git a/pystencils_walberla/__init__.py b/pystencils_walberla/__init__.py
index 5d8aab2..b8f06f3 100644
--- a/pystencils_walberla/__init__.py
+++ b/pystencils_walberla/__init__.py
@@ -1,5 +1,7 @@
-from .codegen import generate_sweep, generate_pack_info_from_kernel, generate_pack_info_for_field, generate_pack_info
from .cmake_integration import CodeGeneration
+from .codegen import (
+ generate_pack_info, generate_pack_info_for_field, generate_pack_info_from_kernel,
+ generate_sweep)
__all__ = ['CodeGeneration',
'generate_sweep', 'generate_pack_info_from_kernel', 'generate_pack_info_for_field', 'generate_pack_info']
diff --git a/pystencils_walberla/cmake_integration.py b/pystencils_walberla/cmake_integration.py
index 459c8a3..b1265a2 100644
--- a/pystencils_walberla/cmake_integration.py
+++ b/pystencils_walberla/cmake_integration.py
@@ -10,8 +10,8 @@ Usage example:
"""
import json
-import sys
import os
+import sys
import warnings
__all__ = ['CodeGeneration', 'ManualCodeGenerationContext']
diff --git a/pystencils_walberla/codegen.py b/pystencils_walberla/codegen.py
index 60698ba..4a70883 100644
--- a/pystencils_walberla/codegen.py
+++ b/pystencils_walberla/codegen.py
@@ -1,15 +1,16 @@
-from jinja2 import Environment, PackageLoader
from collections import OrderedDict, defaultdict
from itertools import product
-from typing import Dict, Sequence, Tuple, Optional
+from typing import Dict, Optional, Sequence, Tuple
+
+from jinja2 import Environment, PackageLoader
-from pystencils import create_staggered_kernel, Field, create_kernel, Assignment, FieldType, AssignmentCollection
+from pystencils import (
+ Assignment, AssignmentCollection, Field, FieldType, create_kernel, create_staggered_kernel)
from pystencils.backends.cbackend import get_headers
from pystencils.backends.simd_instruction_sets import get_supported_instruction_sets
-from pystencils.stencil import offset_to_direction_string, inverse_direction
+from pystencils.stencil import inverse_direction, offset_to_direction_string
from pystencils_walberla.jinja_filters import add_pystencils_filters_to_jinja_env
-
__all__ = ['generate_sweep', 'generate_pack_info', 'generate_pack_info_for_field', 'generate_pack_info_from_kernel',
'default_create_kernel_parameters', 'KernelInfo']
diff --git a/pystencils_walberla/jinja_filters.py b/pystencils_walberla/jinja_filters.py
index b7a578b..9ce43a8 100644
--- a/pystencils_walberla/jinja_filters.py
+++ b/pystencils_walberla/jinja_filters.py
@@ -1,8 +1,9 @@
-import sympy as sp
import jinja2
+import sympy as sp
+
from pystencils import TypedSymbol
+from pystencils.backends.cbackend import CustomSympyPrinter, generate_c
from pystencils.data_types import get_base_type
-from pystencils.backends.cbackend import generate_c, CustomSympyPrinter
from pystencils.field import FieldType
from pystencils.kernelparameters import SHAPE_DTYPE
from pystencils.sympyextensions import prod
diff --git a/pystencils_walberla_tests/test_packinfo_generation.py b/pystencils_walberla_tests/test_packinfo_generation.py
index f0cf9a2..dbe4810 100644
--- a/pystencils_walberla_tests/test_packinfo_generation.py
+++ b/pystencils_walberla_tests/test_packinfo_generation.py
@@ -1,7 +1,8 @@
+import unittest
+
import pystencils as ps
from pystencils_walberla import generate_pack_info_for_field, generate_pack_info_from_kernel
from pystencils_walberla.cmake_integration import ManualCodeGenerationContext
-import unittest
class PackinfoGenTest(unittest.TestCase):
diff --git a/pystencils_walberla_tests/test_walberla_gen.py b/pystencils_walberla_tests/test_walberla_gen.py
index e1caa37..eb8037b 100644
--- a/pystencils_walberla_tests/test_walberla_gen.py
+++ b/pystencils_walberla_tests/test_walberla_gen.py
@@ -1,8 +1,10 @@
+import unittest
+
import sympy as sp
+
import pystencils as ps
from pystencils_walberla import generate_sweep
from pystencils_walberla.cmake_integration import ManualCodeGenerationContext
-import unittest
class CodegenTest(unittest.TestCase):
--
GitLab