m-labs · Dec 2, 2015 · Dec 2, 2015 · Dec 2, 2015
Showing with 6 additions and 10 deletions.

+4 −0 conda/migen/meta.yaml

+0 −1 conda/migen/run_test.bat

+0 −1 conda/migen/run_test.sh

+1 −5 migen/test/test_examples.py

+1 −3 setup.py
diff --git a/conda/migen/meta.yaml b/conda/migen/meta.yaml
@@ -17,6 +17,10 @@ requirements:
   run:
     - python 3.5.*
 
+test:
+  imports:
+    - migen
+
 about:
   home: http://m-labs.hk/gateware.html
   license: 3-clause BSD

diff --git a/conda/migen/run_test.bat b/conda/migen/run_test.bat
diff --git a/conda/migen/run_test.sh b/conda/migen/run_test.sh
diff --git a/migen/test/test_examples.py b/migen/test/test_examples.py
@@ -8,11 +8,7 @@ def _make_test_method(name, foldername):
     def test_method(self):
         filename = name + ".py"
         example_path = os.path.abspath(
-            os.path.join(os.path.dirname(__file__), "..", "examples"))
-        if not os.path.isdir(example_path):
-            # we're running from the source tree
-            example_path = os.path.abspath(
-                os.path.join(os.path.dirname(__file__), "..", "..", "examples"))
+            os.path.join(os.path.dirname(__file__), "..", "..", "examples"))
         filepath = os.path.join(example_path, foldername, filename)
         subprocess.check_call(
             [sys.executable, filepath],

diff --git a/setup.py b/setup.py
@@ -18,9 +18,7 @@
     author_email="sb@m-labs.hk",
     url="http://m-labs.hk",
     download_url="https://github.com/m-labs/migen",
-    packages=find_packages(exclude=('examples.*',)) + ['migen.examples'],
-    package_dir={'migen.examples': 'examples'},
-    package_data={'migen.examples': ['**/*.py']},
+    packages=find_packages(),
     test_suite="migen.test",
     license="BSD",
     platforms=["Any"],