Merge pull request #409 from lucasmiranda42/master

Update setup.py
danielegrattarola · Feb 11, 2023 · 39fe897 · 39fe897
2 parents 96e2912 + efe2cf1
commit 39fe897
Show file tree

Hide file tree

Showing 28 changed files with 96 additions and 93 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,3 +1,36 @@
 [build-system]
 requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "spektral"
+version = "1.2.0"
+authors = [
+    { name="Daniele Grattarola", email="daniele.grattarola@gmail.com" },
+]
+description = "Graph Neural Networks with Keras and TensorFlow."
+readme = "README.md"
+requires-python = ">=3.7"
+classifiers=[
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "joblib",
+    "lxml",
+    "networkx",
+    "numpy",
+    "pandas",
+    "requests",
+    "scikit-learn",
+    "scipy",
+    "tensorflow>=2.2.0;platform_machine != 'arm64' or platform_system != 'Darwin'",
+    "tensorflow-macos>=2.5.0;platform_machine == 'arm64' and platform_system == 'Darwin'",
+    "tqdm",
+]
+
+
+[project.urls]
+homepage = "https://github.com/danielegrattarola/spektral"
+documentation = "https://graphneural.network"
diff --git a/setup.py b/setup.py
@@ -1,34 +1,4 @@
-from setuptools import find_packages, setup
+import setuptools
 
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setup(
-    name="spektral",
-    version="1.2.0",
-    packages=find_packages(),
-    install_requires=[
-        "joblib",
-        "lxml",
-        "networkx",
-        "numpy",
-        "pandas",
-        "requests",
-        "scikit-learn",
-        "scipy",
-        "tensorflow>=2.2.0",
-        "tqdm",
-    ],
-    url="https://github.com/danielegrattarola/spektral",
-    license="MIT",
-    author="Daniele Grattarola",
-    author_email="daniele.grattarola@gmail.com",
-    description="Graph Neural Networks with Keras and Tensorflow 2.",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    classifiers=[
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-    ],
-)
+if __name__ == "__main__":
+    setuptools.setup()
diff --git a/spektral/layers/base.py b/spektral/layers/base.py
@@ -116,7 +116,7 @@ def __init__(
         kernel_initializer="glorot_uniform",
         kernel_regularizer=None,
         kernel_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(**kwargs)
         self.trainable_kernel = trainable_kernel

diff --git a/spektral/layers/convolutional/appnp_conv.py b/spektral/layers/convolutional/appnp_conv.py
@@ -73,7 +73,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -85,7 +85,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.mlp_hidden = mlp_hidden if mlp_hidden else []

diff --git a/spektral/layers/convolutional/arma_conv.py b/spektral/layers/convolutional/arma_conv.py
@@ -82,7 +82,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -94,7 +94,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.iterations = iterations

diff --git a/spektral/layers/convolutional/censnet_conv.py b/spektral/layers/convolutional/censnet_conv.py
@@ -74,7 +74,7 @@ def __init__(
         node_constraint=None,
         edge_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -86,7 +86,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
 
         self.node_channels = node_channels

diff --git a/spektral/layers/convolutional/cheb_conv.py b/spektral/layers/convolutional/cheb_conv.py
@@ -72,7 +72,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -84,7 +84,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.K = K

diff --git a/spektral/layers/convolutional/crystal_conv.py b/spektral/layers/convolutional/crystal_conv.py
@@ -61,7 +61,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             aggregate=aggregate,
@@ -74,7 +74,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
 
     def build(self, input_shape):

diff --git a/spektral/layers/convolutional/diffusion_conv.py b/spektral/layers/convolutional/diffusion_conv.py
@@ -36,7 +36,7 @@ def __init__(
         kernel_initializer,
         kernel_regularizer,
         kernel_constraint,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(**kwargs)
 
@@ -124,14 +124,14 @@ def __init__(
         kernel_initializer="glorot_uniform",
         kernel_regularizer=None,
         kernel_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
             kernel_initializer=kernel_initializer,
             kernel_regularizer=kernel_regularizer,
             kernel_constraint=kernel_constraint,
-            **kwargs
+            **kwargs,
         )
 
         self.channels = channels

diff --git a/spektral/layers/convolutional/ecc_conv.py b/spektral/layers/convolutional/ecc_conv.py
@@ -76,7 +76,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -88,7 +88,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.kernel_network = kernel_network

diff --git a/spektral/layers/convolutional/edge_conv.py b/spektral/layers/convolutional/edge_conv.py
@@ -66,7 +66,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             aggregate=aggregate,
@@ -79,7 +79,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.mlp_hidden = mlp_hidden if mlp_hidden else []
@@ -107,7 +107,7 @@ def build(self, input_shape):
                     self.channels,
                     self.activation,
                     use_bias=self.use_bias,
-                    **layer_kwargs
+                    **layer_kwargs,
                 )
             ]
         )

diff --git a/spektral/layers/convolutional/gat_conv.py b/spektral/layers/convolutional/gat_conv.py
@@ -95,7 +95,7 @@ def __init__(
         kernel_constraint=None,
         bias_constraint=None,
         attn_kernel_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -107,7 +107,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.attn_heads = attn_heads

diff --git a/spektral/layers/convolutional/gated_graph_conv.py b/spektral/layers/convolutional/gated_graph_conv.py
@@ -64,7 +64,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -76,7 +76,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.n_layers = n_layers

diff --git a/spektral/layers/convolutional/gcn_conv.py b/spektral/layers/convolutional/gcn_conv.py
@@ -58,7 +58,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -70,7 +70,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
 

diff --git a/spektral/layers/convolutional/gcs_conv.py b/spektral/layers/convolutional/gcs_conv.py
@@ -55,7 +55,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             activation=activation,
@@ -67,7 +67,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
 

diff --git a/spektral/layers/convolutional/general_conv.py b/spektral/layers/convolutional/general_conv.py
@@ -88,7 +88,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             aggregate=aggregate,
@@ -101,7 +101,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.dropout_rate = dropout

diff --git a/spektral/layers/convolutional/gin_conv.py b/spektral/layers/convolutional/gin_conv.py
@@ -74,7 +74,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             aggregate=aggregate,
@@ -87,7 +87,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.epsilon = epsilon

diff --git a/spektral/layers/convolutional/graphsage_conv.py b/spektral/layers/convolutional/graphsage_conv.py
@@ -64,7 +64,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             aggregate=aggregate,
@@ -77,7 +77,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
 

diff --git a/spektral/layers/convolutional/tag_conv.py b/spektral/layers/convolutional/tag_conv.py
@@ -61,7 +61,7 @@ def __init__(
         activity_regularizer=None,
         kernel_constraint=None,
         bias_constraint=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(
             aggregate=aggregate,
@@ -74,7 +74,7 @@ def __init__(
             activity_regularizer=activity_regularizer,
             kernel_constraint=kernel_constraint,
             bias_constraint=bias_constraint,
-            **kwargs
+            **kwargs,
         )
         self.channels = channels
         self.K = K