fix contrib/__init__.py, add contrib to setup.py

kwant/contrib/__init__.py

@@ -6,5 +6,8 @@
 # the AUTHORS file at the top-level directory of this distribution and at
 # http://kwant-project.org/authors.
 
-__all__ = ['rmt']
-from . import rmt
+"""This package contains various sub-packages that are useful with kwant, but
+are not considered to be part of kwant.
+
+The sub-packages have to be imported explicitly.
+"""

setup.py

@@ -333,9 +333,10 @@ def main():
           url="http://kwant-project.org/",
           license="BSD",
           packages=["kwant", "kwant.graph", "kwant.linalg", "kwant.physics",
-                    "kwant.solvers", "kwant.tests", "kwant.graph.tests",
-                    "kwant.linalg.tests", "kwant.physics.tests",
-                    "kwant.solvers.tests"],
+                    "kwant.solvers", "kwant.contrib",
+                    "kwant.tests", "kwant.graph.tests", "kwant.linalg.tests",
+                    "kwant.physics.tests", "kwant.solvers.tests",
+                    "kwant.contrib.tests"],
           cmdclass={'build': kwant_build,
                     'sdist': kwant_sdist,
                     'build_ext': kwant_build_ext,