Browse Source

isort imports

Fabian Peter Hammerle 4 years ago
parent
commit
1f7c871c32
8 changed files with 44 additions and 37 deletions
  1. 1 0
      .gitignore
  2. 1 0
      Pipfile
  3. 35 28
      Pipfile.lock
  4. 1 2
      tests/test_annotation.py
  5. 1 2
      tests/test_main.py
  6. 2 1
      tests/test_polygonal_chain.py
  7. 1 1
      tests/test_setlocale.py
  8. 2 3
      tests/test_surface.py

+ 1 - 0
.gitignore

@@ -2,4 +2,5 @@
 .ipynb_checkpoints/
 build/
 dist/
+tags
 version.py

+ 1 - 0
Pipfile

@@ -11,6 +11,7 @@ pylint = ">=2.3.0,<3"
 pytest = "<5"
 pytest-cov = "<3,>=2"
 "autopep8" = "<2"
+isort = "<5"
 
 [requires]
 python_version = "3"

+ 35 - 28
Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "9f4b353098ebb834c6bff1eff489f9d5fe7a33476e10720b45e6cba07dea4cff"
+            "sha256": "a531d804aa71da80a97b5b144d8a9c6b099262f910f14b25b4ddc61a9f439b92"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -46,7 +46,6 @@
                 "sha256:cfef82c43b8b29ca436560d51b2251d5117818a8d1fb74a8384a83c096745dad",
                 "sha256:d160e57731fcdec2beda807ebcabf39823c47e9409485b5a3a1db3a8c6ce763e"
             ],
-            "index": "pypi",
             "version": "==1.16.3"
         }
     },
@@ -117,33 +116,34 @@
         },
         "isort": {
             "hashes": [
-                "sha256:1349c6f7c2a0f7539f5f2ace51a9a8e4a37086ce4de6f78f5f53fb041d0a3cd5",
-                "sha256:f09911f6eb114e5592abe635aded8bf3d2c3144ebcfcaf81ee32e7af7b7d1870"
+                "sha256:c40744b6bc5162bbb39c1257fe298b7a393861d50978b565f3ccd9cb9de0182a",
+                "sha256:f57abacd059dc3bd666258d1efb0377510a89777fda3e3274e3c01f7c03ae22d"
             ],
-            "version": "==4.3.18"
+            "index": "pypi",
+            "version": "==4.3.20"
         },
         "lazy-object-proxy": {
             "hashes": [
-                "sha256:118d53f8819f9457732dd0e418752f2850f395c5405b2e12485f52336e4ad0f5",
-                "sha256:495c583b363c3eded649e2c00177093f03f856f5c9f95b527420084a9ce17b9d",
-                "sha256:55fa9eab93482891ce97473e63610efdd9c8fa5c05cca9f60468c412e602e499",
-                "sha256:642fc0a9b61920669dab66e400f79f1b8b0e8f698dcde85f7e9ae5528dbcaf4a",
-                "sha256:7003959a170fde9b92936c38562810f94679c80608fb4b007e026b915bef8b27",
-                "sha256:7e63da94f5a1ddb0d2dcdb5d17ff4d1d33f51f3368bdf0475d5f56c0f3b99592",
-                "sha256:7fb11d33d99a374e4b0c3fb20128890b9cf784ca7e4b91ecbb191d34618bd9fe",
-                "sha256:8758715ea005afa293783797498d64f40ab14d1ded208b3e282760cde9512f1d",
-                "sha256:8995543f47a8b81962e384f12791114af9f4997be7a0db71abc40d2a2dfee961",
-                "sha256:91c7e1316116fedda36818ce7cd269378fffc4219781536eff441ea1e68e1caf",
-                "sha256:9b41ec246d31ca6a840dcf67673b2668adc5a095c64310d26d73292588563ea3",
-                "sha256:a8be3cfd7c3154e8d39276c627c5e7ee55d1f2094597b060ece99620ef9fe86b",
-                "sha256:afcab74f471652b643900e0862b31892ac5fe5a75e435b786a1825855f4effdf",
-                "sha256:d49a90c27074f44c8dc147d83e31140523948ee147b3248634c540e053caea58",
-                "sha256:d6957cadc9c079ef4697564af500d52fba6d14fb2f08d20ce92f52201fb77050",
-                "sha256:da7f2a6c82a11dc4e05bab73522f0d6dd4f3bbc8378cd4b0769137f342cdb3f0",
-                "sha256:f03a21f6f6e54778860122a620f70c8b148ec4ee175968782bcaaa94955a46f9",
-                "sha256:f6c718ffca055852479880debbe717da952fcfd60067a0ddb6fe3b053b1d4de0"
-            ],
-            "version": "==1.4.0"
+                "sha256:159a745e61422217881c4de71f9eafd9d703b93af95618635849fe469a283661",
+                "sha256:23f63c0821cc96a23332e45dfaa83266feff8adc72b9bcaef86c202af765244f",
+                "sha256:3b11be575475db2e8a6e11215f5aa95b9ec14de658628776e10d96fa0b4dac13",
+                "sha256:3f447aff8bc61ca8b42b73304f6a44fa0d915487de144652816f950a3f1ab821",
+                "sha256:4ba73f6089cd9b9478bc0a4fa807b47dbdb8fad1d8f31a0f0a5dbf26a4527a71",
+                "sha256:4f53eadd9932055eac465bd3ca1bd610e4d7141e1278012bd1f28646aebc1d0e",
+                "sha256:64483bd7154580158ea90de5b8e5e6fc29a16a9b4db24f10193f0c1ae3f9d1ea",
+                "sha256:6f72d42b0d04bfee2397aa1862262654b56922c20a9bb66bb76b6f0e5e4f9229",
+                "sha256:7c7f1ec07b227bdc561299fa2328e85000f90179a2f44ea30579d38e037cb3d4",
+                "sha256:7c8b1ba1e15c10b13cad4171cfa77f5bb5ec2580abc5a353907780805ebe158e",
+                "sha256:8559b94b823f85342e10d3d9ca4ba5478168e1ac5658a8a2f18c991ba9c52c20",
+                "sha256:a262c7dfb046f00e12a2bdd1bafaed2408114a89ac414b0af8755c696eb3fc16",
+                "sha256:acce4e3267610c4fdb6632b3886fe3f2f7dd641158a843cf6b6a68e4ce81477b",
+                "sha256:be089bb6b83fac7f29d357b2dc4cf2b8eb8d98fe9d9ff89f9ea6012970a853c7",
+                "sha256:bfab710d859c779f273cc48fb86af38d6e9210f38287df0069a63e40b45a2f5c",
+                "sha256:c10d29019927301d524a22ced72706380de7cfc50f767217485a912b4c8bd82a",
+                "sha256:dd6e2b598849b3d7aee2295ac765a578879830fb8966f70be8cd472e6069932e",
+                "sha256:e408f1eacc0a68fed0c08da45f31d0ebb38079f043328dce69ff133b95c29dc1"
+            ],
+            "version": "==1.4.1"
         },
         "mccabe": {
             "hashes": [
@@ -191,11 +191,11 @@
         },
         "pytest": {
             "hashes": [
-                "sha256:136632a40451162cdfc18fe4d7ecc5d169b558a3d4bbb1603d4005308a42fd03",
-                "sha256:62b129bf8368554ca7a942cbdb57ea26aafef46cc65bc317cdac3967e54483a3"
+                "sha256:1a8aa4fa958f8f451ac5441f3ac130d9fc86ea38780dd2715e6d5c5882700b24",
+                "sha256:b8bf138592384bd4e87338cb0f256bf5f615398a649d4bd83915f0e4047a5ca6"
             ],
             "index": "pypi",
-            "version": "==4.4.2"
+            "version": "==4.5.0"
         },
         "pytest-cov": {
             "hashes": [
@@ -237,6 +237,13 @@
             "markers": "implementation_name == 'cpython'",
             "version": "==1.3.5"
         },
+        "wcwidth": {
+            "hashes": [
+                "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
+                "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
+            ],
+            "version": "==0.1.7"
+        },
         "wrapt": {
             "hashes": [
                 "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533"

+ 1 - 2
tests/test_annotation.py

@@ -1,6 +1,5 @@
-from freesurfer_surface import Annotation
-
 from conftest import ANNOTATION_FILE_PATH
+from freesurfer_surface import Annotation
 
 
 def test_load_annotation():

+ 1 - 2
tests/test_main.py

@@ -6,11 +6,10 @@ import unittest.mock
 
 import numpy
 
+from conftest import ANNOTATION_FILE_PATH, SURFACE_FILE_PATH
 from freesurfer_surface import Surface, Triangle, Vertex
 from freesurfer_surface.__main__ import annotation_labels, unite_surfaces
 
-from conftest import ANNOTATION_FILE_PATH, SURFACE_FILE_PATH
-
 
 def check_rows(csv_rows: typing.List[str]):
     assert len(csv_rows) == 36 + 1

+ 2 - 1
tests/test_polygonal_chain.py

@@ -1,6 +1,7 @@
 import pytest
 
-from freesurfer_surface import PolygonalChain, PolygonalChainsNotOverlapingError, LineSegment
+from freesurfer_surface import (LineSegment, PolygonalChain,
+                                PolygonalChainsNotOverlapingError)
 
 
 def test_init():

+ 1 - 1
tests/test_setlocale.py

@@ -2,7 +2,7 @@ import locale
 
 import pytest
 
-from freesurfer_surface import setlocale, UnsupportedLocaleSettingError
+from freesurfer_surface import UnsupportedLocaleSettingError, setlocale
 
 
 def test_set():

+ 2 - 3
tests/test_surface.py

@@ -4,10 +4,9 @@ import datetime
 import numpy
 import pytest
 
-from freesurfer_surface import setlocale, Vertex, Triangle, LineSegment, \
-                               Annotation, Surface, PolygonalCircuit
-
 from conftest import ANNOTATION_FILE_PATH, SURFACE_FILE_PATH
+from freesurfer_surface import (Annotation, LineSegment, PolygonalCircuit,
+                                Surface, Triangle, Vertex, setlocale)
 
 # pylint: disable=protected-access