From ac90679544aa0f0bd78d0b60e21719413725f3dd Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Thu, 29 Aug 2013 15:26:05 -0400 Subject: [PATCH] restructure calc --- common/lib/calc/calc/__init__.py | 1 + common/lib/calc/{ => calc}/calc.py | 0 common/lib/calc/{ => calc}/calcfunctions.py | 0 common/lib/calc/{ => calc}/preview.py | 0 common/lib/calc/{ => calc}/tests/test_calc.py | 0 common/lib/calc/{ => calc}/tests/test_preview.py | 0 common/lib/calc/setup.py | 2 +- 7 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 common/lib/calc/calc/__init__.py rename common/lib/calc/{ => calc}/calc.py (100%) rename common/lib/calc/{ => calc}/calcfunctions.py (100%) rename common/lib/calc/{ => calc}/preview.py (100%) rename common/lib/calc/{ => calc}/tests/test_calc.py (100%) rename common/lib/calc/{ => calc}/tests/test_preview.py (100%) diff --git a/common/lib/calc/calc/__init__.py b/common/lib/calc/calc/__init__.py new file mode 100644 index 0000000000..5956cb38b5 --- /dev/null +++ b/common/lib/calc/calc/__init__.py @@ -0,0 +1 @@ +from calc import * diff --git a/common/lib/calc/calc.py b/common/lib/calc/calc/calc.py similarity index 100% rename from common/lib/calc/calc.py rename to common/lib/calc/calc/calc.py diff --git a/common/lib/calc/calcfunctions.py b/common/lib/calc/calc/calcfunctions.py similarity index 100% rename from common/lib/calc/calcfunctions.py rename to common/lib/calc/calc/calcfunctions.py diff --git a/common/lib/calc/preview.py b/common/lib/calc/calc/preview.py similarity index 100% rename from common/lib/calc/preview.py rename to common/lib/calc/calc/preview.py diff --git a/common/lib/calc/tests/test_calc.py b/common/lib/calc/calc/tests/test_calc.py similarity index 100% rename from common/lib/calc/tests/test_calc.py rename to common/lib/calc/calc/tests/test_calc.py diff --git a/common/lib/calc/tests/test_preview.py b/common/lib/calc/calc/tests/test_preview.py similarity index 100% rename from common/lib/calc/tests/test_preview.py rename to common/lib/calc/calc/tests/test_preview.py diff --git a/common/lib/calc/setup.py b/common/lib/calc/setup.py index cb638914f9..30f6427c04 100644 --- a/common/lib/calc/setup.py +++ b/common/lib/calc/setup.py @@ -3,7 +3,7 @@ from setuptools import setup setup( name="calc", version="0.1.1", - py_modules=["calc"], + packages=["calc"], install_requires=[ "pyparsing==1.5.6", "numpy",