Merge pull request #103 from TG1999/add_isort

Add isort with configuration

Author: TG1999

pyproject.toml

@@ -50,3 +50,9 @@ addopts = [
     "--strict-markers",
     "--doctest-modules"
 ]
+
+[tool.isort]
+profile = "black"
+line_length = 100
+force_single_line = true
+skip_gitignore = true

requirements.txt

@@ -3,3 +3,4 @@ packaging==21.0
 pyparsing==2.4.7
 semantic-version==2.8.5
 semver==2.13.0
+isort==5.10.1

setup.cfg

@@ -74,6 +74,7 @@ testing =
     aboutcode-toolkit >= 6.0.0
     black
     commoncode
+    isort>=5.10.1
 
 docs =
     Sphinx >= 3.3.1

src/univers/debian.py

@@ -15,8 +15,8 @@
 from itertools import zip_longest
 
 from attr import asdict
-from attr import attrs
 from attr import attrib
+from attr import attrs
 
 logger = logging.getLogger(__name__)
 

src/univers/version_constraint.py

@@ -8,6 +8,7 @@
 from functools import total_ordering
 
 import attr
+
 from univers.utils import remove_spaces
 from univers.versions import Version
 

src/univers/versions.py

@@ -4,8 +4,8 @@
 #
 # Visit https://aboutcode.org and https://github.com/nexB/univers for support and download.
 
-from functools import total_ordering
 import functools
+from functools import total_ordering
 
 import attr
 import semantic_version
@@ -14,9 +14,9 @@
 from univers import arch
 from univers import debian
 from univers import gem
-from univers import nuget
 from univers import gentoo
 from univers import maven
+from univers import nuget
 from univers import rpm
 from univers.utils import remove_spaces
 

tests/nuget/test_nuget_floating_range.py

@@ -8,7 +8,6 @@
 from univers.version_range import NugetVersionRange as VersionRange
 from univers.versions import NugetVersion as NuGetVersion
 
-
 """
 NuGet Float ranges are not yet supported in Univers.
 

tests/nuget/test_nuget_semver_201_spec.py

@@ -5,8 +5,8 @@
 
 import pytest
 
-from univers.utils import cmp
 from univers import nuget
+from univers.utils import cmp
 
 
 # A normal version number MUST take the form X.Y.Z

tests/test_alpine.py

@@ -8,6 +8,7 @@
 from typing import NamedTuple
 
 import pytest
+
 from univers.versions import AlpineLinuxVersion
 from univers.versions import InvalidVersion
 

tests/test_codestyle.py

@@ -22,3 +22,16 @@ def test_codestyle(self):
                 "  python -m black -l 100 setup.py src tests",
                 e.output,
             ) from e
+
+        args = "isort --check-only src tests setup.py"
+        try:
+            subprocess.check_output(args.split())
+        except Exception as e:
+            print("===========================================================")
+            print(e.output)
+            print("===========================================================")
+            raise Exception(
+                "Unsorted imports, please sort your imports using isort. "
+                "Alternatively, run ``isort src tests setup.py``",
+                e.output,
+            ) from e