From 91aa9d3a5b72acd83f648ed757663fdea62ed460 Mon Sep 17 00:00:00 2001
From: Christoph Groth <christoph.groth@cea.fr>
Date: Wed, 13 Feb 2013 14:08:28 +0100
Subject: [PATCH] fix contrib/__init__.py, add contrib to setup.py

---
 kwant/contrib/__init__.py | 7 +++++--
 setup.py                  | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/kwant/contrib/__init__.py b/kwant/contrib/__init__.py
index c52331e..0754469 100644
--- a/kwant/contrib/__init__.py
+++ b/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.
+"""
diff --git a/setup.py b/setup.py
index 08ca2ba..5ada197 100755
--- a/setup.py
+++ b/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,
-- 
GitLab