Rename DiverseSelector to selector

{DiverseSelector → selector}/__init__.py

@@ -21,9 +21,9 @@
 #
 # --
 
-"""The main DiverseSelector Package."""
+"""Selector Package."""
 
-from DiverseSelector.methods import *
+from selector.methods import *
 
 
 # Handle versioneer

{DiverseSelector → selector}/diversity.py

@@ -27,7 +27,7 @@ import warnings
 from typing import List
 
 import numpy as np
-from DiverseSelector.distance import tanimoto
+from selector.distance import tanimoto
 
 
 __all__ = [

{DiverseSelector → selector}/methods/__init__.py

@@ -21,6 +21,6 @@
 #
 # --
 
-from DiverseSelector.methods.dissimilarity import *
-from DiverseSelector.methods.partition import *
-from DiverseSelector.methods.similarity import *
+from selector.methods.dissimilarity import *
+from selector.methods.partition import *
+from selector.methods.similarity import *

{DiverseSelector → selector}/methods/dissimilarity.py

@@ -24,8 +24,8 @@
 import numpy as np
 from scipy import spatial
 
-from DiverseSelector.methods.base import SelectionBase
-from DiverseSelector.methods.utils import optimize_radius
+from selector.methods.base import SelectionBase
+from selector.methods.utils import optimize_radius
 
 
 __all__ = [

{DiverseSelector → selector}/methods/partition.py

@@ -28,9 +28,9 @@ import math
 import bitarray
 import scipy.spatial
 
-from DiverseSelector.methods.base import SelectionBase
-from DiverseSelector.diversity import compute_diversity, hypersphere_overlap_of_subset
-from DiverseSelector.methods.utils import optimize_radius
+from selector.methods.base import SelectionBase
+from selector.diversity import compute_diversity, hypersphere_overlap_of_subset
+from selector.methods.utils import optimize_radius
 import numpy as np
 from scipy import spatial
 

{DiverseSelector → selector}/methods/similarity.py

@@ -40,7 +40,7 @@ from math import log
 import random
 from typing import List, Optional, Union
 
-from DiverseSelector.methods.base import SelectionBase
+from selector.methods.base import SelectionBase
 import numpy as np
 
 
@@ -808,6 +808,7 @@ class SimilarityIndex:
 # index they calculate. The _nw suffix indicates that the similarity index is not weighted.
 # More information about the similarity indexes can be found in the following paper:
 
+
 def _ac_nw(counters: dict) -> float:
     """Calculate the Austin-Colwell (AC) similarity index.
 

{DiverseSelector → selector}/methods/tests/test_dissimilarity.py

@@ -23,11 +23,11 @@
 """Test Dissimilarity-Based Selection Methods."""
 
 
-from DiverseSelector.methods.dissimilarity import MaxMin, MaxSum, OptiSim
+from selector.methods.dissimilarity import MaxMin, MaxSum, OptiSim
 import numpy as np
 from numpy.testing import assert_equal
 from sklearn.metrics import pairwise_distances
-from DiverseSelector.methods.tests.common import generate_synthetic_data
+from selector.methods.tests.common import generate_synthetic_data
 import pytest
 
 

{DiverseSelector → selector}/methods/tests/test_partition.py

@@ -26,12 +26,12 @@ import numpy as np
 from numpy.testing import assert_equal, assert_raises
 import pytest
 
-from DiverseSelector.methods.partition import (
+from selector.methods.partition import (
     DirectedSphereExclusion,
     GridPartitioning,
     Medoid,
 )
-from DiverseSelector.methods.tests.common import generate_synthetic_data
+from selector.methods.tests.common import generate_synthetic_data
 
 
 def test_directed_sphere_size_error():
@@ -96,11 +96,11 @@ def test_directed_sphere_on_line_with_larger_radius():
           [0, 1],
           [0, 1.1],
           [0, 1.2],
-          [0, 2], 
-          [0, 3], 
-          [0, 3.1], 
+          [0, 2],
+          [0, 3],
+          [0, 3.1],
           [0, 3.2],
-          [0, 4], 
+          [0, 4],
           [0, 5],
         ]
     )

{DiverseSelector → selector}/tests/test_converter.py

@@ -23,7 +23,7 @@
 
 """Testing for Converter.py."""
 
-import DiverseSelector.converter as cv
+import selector.converter as cv
 import numpy as np
 from numpy.testing import assert_almost_equal, assert_equal, assert_raises
 

{DiverseSelector → selector}/tests/test_distance.py

@@ -24,7 +24,7 @@
 """Test distance.py Module."""
 
 
-from DiverseSelector.distance import (
+from selector.distance import (
     pairwise_similarity_bit,
     tanimoto,
     modified_tanimoto,

{DiverseSelector → selector}/tests/test_diversity.py

@@ -26,7 +26,7 @@
 import pytest
 import numpy as np
 from numpy.testing import assert_almost_equal, assert_equal, assert_raises, assert_warns
-from DiverseSelector.diversity import (
+from selector.diversity import (
     compute_diversity,
     gini_coefficient,
     explicit_diversity_index,

{DiverseSelector → selector}/tests/test_similarity.py

@@ -29,7 +29,7 @@ import numpy as np
 from numpy.testing import assert_almost_equal, assert_equal, assert_raises
 import pkg_resources
 import pytest
-from DiverseSelector.methods.similarity import NSimilarity, SimilarityIndex
+from selector.methods.similarity import NSimilarity, SimilarityIndex
 
 
 def test_SimilarityIndex_init_raises():

setup.py

@@ -41,7 +41,7 @@ except ValueError:
 
 
 setup(
-    name="DiverseSelector",
+    name="selector",
     author="QC-Devs Community",
     author_email="qcdevs@gmail.com",
     description=short_description,
@@ -50,44 +50,38 @@ setup(
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
     license="GNU (Version 3)",
-
-    package_dir={"DiverseSelector": "DiverseSelector"},
-    packages=["DiverseSelector",
-              "DiverseSelector.methods",
-              "DiverseSelector.tests",
-              "DiverseSelector.methods.tests"],
-
+    package_dir={"selector": "selector"},
+    packages=["selector", "selector.methods", "selector.tests", "selector.methods.tests"],
     # Optional include package data to ship with your package
     # Customize MANIFEST.in if the general case does not suit your needs
     # Comment out this line to prevent the files from being packaged with your software
     include_package_data=True,
-
     # Allows `setup.py test` to work correctly with pytest
-    setup_requires=["numpy>=1.21.2",
-                    "scipy==1.11.1",
-                    "pytest>=6.2.4",
-                    "scikit-learn",
-                    "bitarray",
-                    ] + pytest_runner,
-
+    setup_requires=[
+        "numpy>=1.21.2",
+        "scipy==1.11.1",
+        "pytest>=6.2.4",
+        "scikit-learn",
+        "bitarray",
+    ]
+    + pytest_runner,
     # Additional entries you may want simply uncomment the lines you want and fill in the data
     url="https://github.com/theochem/DiverseSelector",  # Website
-    install_requires=["numpy>=1.21.2",
-                      "scipy==1.11.1",
-                      "pytest>=6.2.4",
-                      "scikit-learn",
-                      "bitarray",
-                      ],
+    install_requires=[
+        "numpy>=1.21.2",
+        "scipy==1.11.1",
+        "pytest>=6.2.4",
+        "scikit-learn",
+        "bitarray",
+    ],
     # platforms=["Linux",
     #            "Mac OS-X",
     #            "Unix",
     #            "Windows"],
     # Python version restrictions
     python_requires=">=3.7",
-
     # Manual control if final package is compressible or not, set False to prevent the .egg
     # from being made
     # zip_safe=False,
-
     # todo: add classifiers
 )