removed need for absolute imports

spacetimeengineer · Feb 21, 2019 · 26df1b6 · 26df1b6
1 parent 02063c9
commit 26df1b6
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 44 deletions.
diff --git a/build/.DS_Store b/build/.DS_Store
diff --git a/build/lib/spacetimeengine/__init__.py b/build/lib/spacetimeengine/__init__.py
@@ -0,0 +1,2 @@
+from spacetimeengine.src.solutions import *
+from spacetimeengine.src.spacetime import *
diff --git a/build/lib/spacetimeengine/example.py b/build/lib/spacetimeengine/example.py
diff --git a/build/lib/spacetimeengine/src/__init__.py b/build/lib/spacetimeengine/src/__init__.py
@@ -0,0 +1,4 @@
+from os.path import dirname, basename, isfile
+import glob
+modules = glob.glob(dirname(__file__)+"/*.py")
+__all__ = [ basename(f)[:-3] for f in modules if isfile(f) and not f.endswith('__init__.py')]
diff --git a/build/lib/spacetimeengine/tests/__init__.py b/build/lib/spacetimeengine/tests/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from sympy import *
-from spacetimeengine.spacetime import *
-from spacetimeengine.solutions import *
+from src.spacetime import *
+from src.solutions import *
 import unittest
 
 class Test(unittest.TestCase):
@@ -92,4 +92,4 @@ def test_riemann_skew_symmetry(self):
         self.assertEqual(a, -1*b)
         self.assertEqual(a, -1*c)
 
-unittest.main()
+unittest.main()
diff --git a/dist/spacetimeengine-0.1.10-py2-none-any.whl b/dist/spacetimeengine-0.1.10-py2-none-any.whl
diff --git a/dist/spacetimeengine-0.1.10.tar.gz b/dist/spacetimeengine-0.1.10.tar.gz
diff --git a/dist/spacetimeengine-0.1.11-py2-none-any.whl b/dist/spacetimeengine-0.1.11-py2-none-any.whl
diff --git a/dist/spacetimeengine-0.1.11.tar.gz b/dist/spacetimeengine-0.1.11.tar.gz
diff --git a/setup.py b/setup.py
@@ -7,14 +7,9 @@
 
 requirements = ['sympy']
 
-modules = [
-    'spacetimeengine.src.solutions',
-    'spacetimeengine.src.spacetime',
-]
-
 setuptools.setup(
     name="spacetimeengine",
-    version="0.1.10",
+    version="0.1.11",
     packages=find_packages(),
     author="Michael.C Ryan",
     author_email="[email protected]",

diff --git a/spacetimeengine/__init__.py b/spacetimeengine/__init__.py
@@ -1,4 +1,2 @@
-from os.path import dirname, basename, isfile
-import glob
-modules = glob.glob(dirname(__file__)+"/*.py")
-__all__ = [ basename(f)[:-3] for f in modules if isfile(f) and not f.endswith('__init__.py')]
+from spacetimeengine.src.solutions import *
+from spacetimeengine.src.spacetime import *
diff --git a/spacetimeengine/__init__.py.save b/spacetimeengine/__init__.py.save
@@ -0,0 +1,4 @@
+from os.path import dirname, basename, isfile
+import glob
+modules = glob.glob(dirname(__file__)+"/*.py")
+__all__ = [ basename(
diff --git a/spacetimeengine/__pycache__/__init__.cpython-37.pyc b/spacetimeengine/__pycache__/__init__.cpython-37.pyc
diff --git a/spacetimeengine/__pycache__/example.cpython-37.pyc b/spacetimeengine/__pycache__/example.cpython-37.pyc
diff --git a/spacetimeengine/__pycache__/utilities.cpython-37.pyc b/spacetimeengine/__pycache__/utilities.cpython-37.pyc
diff --git a/spacetimeengine/example.py → spacetimeengine/samples/example.py b/spacetimeengine/example.py → spacetimeengine/samples/example.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-
+from spacetimeengine import *
 
 
 def main():
@@ -22,7 +22,7 @@ def main():
     # Gravity as we know it, without the high order effects.
     newtonian_gravity = Solution().weak_field_approximation()
 
-    newtonian = SpaceTime(Solution().hypersphere_II())
+    newtonian = SpaceTime(Solution().hypersphere())
 
 if __name__ == "__main__":
     main()
diff --git a/spacetimeengine/src/__pycache__/__init__.cpython-37.pyc b/spacetimeengine/src/__pycache__/__init__.cpython-37.pyc
diff --git a/spacetimeengine/tests/__pycache__/__init__.cpython-37.pyc b/spacetimeengine/tests/__pycache__/__init__.cpython-37.pyc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from spacetimeengine.src.solutions import *
		from spacetimeengine.src.spacetime import *