style: run isort and black

xgi-org · nwlandry · Jun 14, 2022 · Jun 5, 2022 · Jun 5, 2022 · Jun 14, 2022
commit b04e1eb6365ccf67288ccc38e95fe9b71f2952f2
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -191,19 +191,19 @@
     (
         master_doc,
         "xgi.tex",
-        u"XGI Documentation",
-        u"Nicholas W. Landry and Leo Torres",
+        "XGI Documentation",
+        "Nicholas W. Landry and Leo Torres",
         "manual",
     ),
 ]
 
-man_pages = [(master_doc, "xgi", u"XGI Documentation", [author], 1)]
+man_pages = [(master_doc, "xgi", "XGI Documentation", [author], 1)]
 
 texinfo_documents = [
     (
         master_doc,
         "XGI",
-        u"XGI Documentation",
+        "XGI Documentation",
         author,
         "XGI",
         "One line description of project.",

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,9 +1,10 @@
-import xgi
 import networkx as nx
 import numpy as np
 import pandas as pd
 import pytest
 
+import xgi
+
 
 @pytest.fixture
 def edgelist1():

diff --git a/tests/stats/test_edgestats.py b/tests/stats/test_edgestats.py
@@ -1,5 +1,6 @@
-import pytest
 import pandas as pd
+import pytest
+
 import xgi
 from xgi.exception import IDNotFound
 

diff --git a/tests/stats/test_nodestats.py b/tests/stats/test_nodestats.py
@@ -1,5 +1,6 @@
-import pytest
 import pandas as pd
+import pytest
+
 import xgi
 from xgi.exception import IDNotFound
 

diff --git a/xgi/__init__.py b/xgi/__init__.py
@@ -8,8 +8,8 @@
     generators,
     linalg,
     readwrite,
-    utils,
     stats,
+    utils,
 )
 from .algorithms import *
 from .classes import *
@@ -18,7 +18,7 @@
 from .generators import *
 from .linalg import *
 from .readwrite import *
-from .utils import *
 from .stats import *
+from .utils import *
 
 __version__ = pkg_resources.require("xgi")[0].version
diff --git a/xgi/algorithms/assortativity.py b/xgi/algorithms/assortativity.py
@@ -1,16 +1,16 @@
+import random
+from itertools import combinations
+
 import numpy as np
+
 import xgi
 from xgi.exception import XGIError
-from itertools import combinations
-import random
 
-__all__ = [
-    "dynamical_assortativity",
-    "degree_assortativity"
-]
+__all__ = ["dynamical_assortativity", "degree_assortativity"]
+
 
 def dynamical_assortativity(H):
-    """ Gets the dynamical assortativity of a uniform hypergraph.
+    """Gets the dynamical assortativity of a uniform hypergraph.
 
     Parameters
     ----------
@@ -29,19 +29,27 @@ def dynamical_assortativity(H):
     """
     if not xgi.is_uniform(H):
         raise XGIError("Hypergraph must be uniform!")
-    
+
     degs = H.degree()
     k1 = np.mean([degs[n] for n in H.nodes])
-    k2 = np.mean([degs[n]**2 for n in H.nodes])
-    kk1 = np.mean([degs[n1]*degs[n2] for e in H.edges for n1, n2 in combinations(H.edges.members(e), 2)])
-
-    return kk1*k1**2/k2**2 - 1
+    k2 = np.mean([degs[n] ** 2 for n in H.nodes])
+    kk1 = np.mean(
+        [
+            degs[n1] * degs[n2]
+            for e in H.edges
+            for n1, n2 in combinations(H.edges.members(e), 2)
+        ]
+    )
+
+    return kk1 * k1**2 / k2**2 - 1
 
 
 def degree_assortativity(H, type="uniform", exact=False, num_samples=1000):
     degs = H.degree()
     if exact:
-        k1k2 = [choose_nodes(e, degs, type) for e in H.edges if len(H.edges.members(e)) > 1]
+        k1k2 = [
+            choose_nodes(e, degs, type) for e in H.edges if len(H.edges.members(e)) > 1
+        ]
     else:
         edges = list([e for e in H.edges if len(H.edges.members(e)) > 1])
         k1k2 = list()
@@ -60,17 +68,17 @@ def choose_nodes(e, k, type="uniform"):
         j = i
         while i == j:
             j = np.random.randint(len(e))
-        return (np.array([k[e[i]], k[e[j]]]))
-    
+        return np.array([k[e[i]], k[e[j]]])
+
     elif type == "top-2":
         degs = sorted([k[i] for i in e])[-2:]
         random.shuffle(degs)
-        return (degs)
-    
+        return degs
+
     elif type == "top-bottom":
-        degs = sorted([k[i] for i in e])[::len(e)-1] 
+        degs = sorted([k[i] for i in e])[:: len(e) - 1]
         random.shuffle(degs)
-        return (degs)
-    
+        return degs
+
     else:
         raise XGIError("Invalid choice function!")
diff --git a/xgi/classes/reportviews.py b/xgi/classes/reportviews.py
@@ -7,10 +7,8 @@
 """
 from collections.abc import Mapping, Set
 
-import numpy as np
-
-from xgi.stats import NodeStatDispatcher, EdgeStatDispatcher
 from xgi.exception import IDNotFound, XGIError
+from xgi.stats import EdgeStatDispatcher, NodeStatDispatcher
 
 __all__ = [
     "NodeView",

diff --git a/xgi/stats/__init__.py b/xgi/stats/__init__.py
@@ -44,16 +44,15 @@
 
 """
 
+from collections import defaultdict
+from typing import Callable
+
 import numpy as np
 import pandas as pd
-from typing import Callable
-from collections import defaultdict
 
 from xgi.exception import IDNotFound
 
-from . import nodestats
-from . import edgestats
-
+from . import edgestats, nodestats
 
 __all__ = ["nodestat_func", "edgestat_func", "EdgeStatDispatcher", "NodeStatDispatcher"]