Structural changes needed for nose to run

Nice for testing in general, and testing multiple versions of Python in particular. Nothing too controversial I hope.
newville · Feb 5, 2015 · 1e3a760 · 1e3a760
1 parent 3a48d9c
commit 1e3a760
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,6 @@ doc/_build
 doc/*.pdf
 build
 dist
-
-MANIFEST
+*.egg-info
+
+MANIFEST
diff --git a/lib/__init__.py → asteval/__init__.py b/lib/__init__.py → asteval/__init__.py
diff --git a/lib/asteval.py → asteval/asteval.py b/lib/asteval.py → asteval/asteval.py
diff --git a/lib/astutils.py → asteval/astutils.py b/lib/astutils.py → asteval/astutils.py
diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from setuptools import setup
-import lib as asteval
+import asteval
 
 setup(name = 'asteval',
       version = asteval.__version__,
@@ -9,7 +9,6 @@
       url  = 'http://github.com/newville/asteval',
       license = 'BSD',
       description = "Safe, minimalistic evaluator of python expression using ast module",
-      package_dir = {'asteval': 'lib'},
       packages = ['asteval'],
       )
 
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/test_1.py b/tests/test_1.py
@@ -6,7 +6,7 @@
 import numpy as np
 from sys import version_info
 
-from unittest_utils import TestCase
+from .unittest_utils import TestCase
 
 from asteval import NameFinder