Remove deprecated hbonds.hbond_analysis

package/MDAnalysis/analysis/__init__.py

@@ -52,10 +52,6 @@
     contains the often-used
     :func:`~MDAnalysis.analysis.distances.distance_array` function.
 
-:mod:`~MDAnalysis.analysis.hbonds`
-    Analyze hydrogen bonds, including both the per frame results as well
-    as the dynamic properties and lifetimes.
-
 :mod:`~MDAnalysis.analysis.helanal`
     Analysis of helices with the HELANAL_ algorithm.
 
@@ -108,6 +104,9 @@
    :mod:`~MDAnalysis.analysis.legacy.x3dna` was moved to the
    :mod:`MDAnalysis.analysis.legacy` package
 
+.. versionchanged:: 2.0.0
+   Removed deprecated :mod:`hbonds.hbond_analysis`
+
 """
 
 __all__ = [
@@ -117,7 +116,6 @@
     'density',
     'distances',
     'gnm',
-    'hbonds',
     'hydrogenbonds',
     'helanal',
     'hole',

package/MDAnalysis/analysis/hbonds/__init__.py

@@ -20,14 +20,19 @@
 # MDAnalysis: A Toolkit for the Analysis of Molecular Dynamics Simulations.
 # J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787
 #
-from __future__ import absolute_import
+
+import warning
+
+warnings.warn(
+            "This module was moved. "
+            "Please use MDAnalysis.analysis.hydrogenbonds instead.",
+            category=DeprecationWarning
+        )
 
 __all__ = [
-    'HydrogenBondAnalysis',
-    'HydrogenBondAutoCorrel', 'find_hydrogen_donors',
+    'HydrogenBondAutoCorrel',
     'WaterBridgeAnalysis',
 ]
 
-from .hbond_analysis import HydrogenBondAnalysis
-from .hbond_autocorrel import HydrogenBondAutoCorrel, find_hydrogen_donors
-from .wbridge_analysis import WaterBridgeAnalysis
+from ..hydrogenbonds import HydrogenBondAutoCorrel, find_hydrogen_donors
+from ..hydrogenbonds import WaterBridgeAnalysis