Remove redistributed KDTree, and make scipy a hard requirement (#438)

* Remove redistributed KDTree, and make scipy a hard requirement

Fixes #437

* Remove the "maybe scipy?" thing from CI

.github/workflows/deploy.yml

@@ -23,17 +23,13 @@ jobs:
        include:
          - py_version: "3.6"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.7"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.8"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.9"
            WITH_CODECOV: true
-           WITH_SCIPY: false
-
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.py_version }}
@@ -44,10 +40,6 @@ jobs:
       run: |
         sudo apt-get install dssp
         pip install --upgrade setuptools pip
-    - if: ${{ matrix.WITH_SCIPY }}
-      name: Install scipy
-      run: |
-        pip install scipy
     - name: Install package and requirements
       run: |
         pip install --upgrade .

.github/workflows/run_tests.yml

@@ -25,23 +25,17 @@ jobs:
        include:
          - py_version: "3.6"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.7"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.8"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.9"
            WITH_CODECOV: true
-           WITH_SCIPY: false
          - py_version: "3.8-dev"
            WITH_CODECOV: true
-           WITH_SCIPY: true
          - py_version: "3.9-dev"
            WITH_CODECOV: true
-           WITH_SCIPY: true
-
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.py_version }}
@@ -52,10 +46,6 @@ jobs:
       run: |
         sudo apt-get install dssp
         pip install --upgrade setuptools pip
-    - if: ${{ matrix.WITH_SCIPY }}
-      name: Install scipy
-      run: |
-        pip install scipy
     - name: Install package and requirements
       run: |
         pip install --upgrade .

setup.cfg

@@ -34,11 +34,8 @@ install-requires =  # ?? requires-dist?
     pbr
     numpy
     networkx ~= 2.0
-zip-safe = False
-
-[options.extras_require]
-full = 
     scipy
+zip-safe = False
 
 [build_sphinx]
 source-dir = doc/source

vermouth/__init__.py

@@ -44,12 +44,7 @@
 
 del pbr
 
-try:
-    from scipy.spatial import cKDTree as KDTree
-except ImportError:
-    LOGGER.info('Using redistributed KDTree. Some functionality might be slow.'
-                ' Install scipy for better performance.', type='performance')
-    from .redistributed.kdtree import KDTree
+from scipy.spatial import cKDTree as KDTree
 
 del LOGGER