From ac90679544aa0f0bd78d0b60e21719413725f3dd Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Thu, 29 Aug 2013 15:26:05 -0400 Subject: [PATCH 1/4] 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 000000000000..5956cb38b538 --- /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 cb638914f9b4..30f6427c0404 100644 --- a/common/lib/calc/setup.py +++ b/common/lib/calc/setup.py @@ -3,7 +3,7 @@ setup( name="calc", version="0.1.1", - py_modules=["calc"], + packages=["calc"], install_requires=[ "pyparsing==1.5.6", "numpy", From 2284f56e203db7033d865b0e77e2424cdabff264 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Thu, 29 Aug 2013 18:01:54 -0400 Subject: [PATCH 2/4] specify preview import statements to reflect new package structure --- common/lib/calc/calc/tests/test_preview.py | 2 +- common/lib/capa/capa/inputtypes.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lib/calc/calc/tests/test_preview.py b/common/lib/calc/calc/tests/test_preview.py index 0008cdda4705..7db307a742c7 100644 --- a/common/lib/calc/calc/tests/test_preview.py +++ b/common/lib/calc/calc/tests/test_preview.py @@ -4,7 +4,7 @@ """ import unittest -import preview +from calc import preview import pyparsing diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py index 9defd2c5e699..d27893d44d62 100644 --- a/common/lib/capa/capa/inputtypes.py +++ b/common/lib/capa/capa/inputtypes.py @@ -49,7 +49,7 @@ from .registry import TagRegistry from chem import chemcalc -from preview import latex_preview +from calc.preview import latex_preview import xqueue_interface from datetime import datetime From 589dcfcc35bc2d57473ff2005cdc09a200cd6ae0 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Fri, 30 Aug 2013 10:31:07 -0400 Subject: [PATCH 3/4] change calcfunctions -> functions --- common/lib/calc/calc/__init__.py | 5 ++++ common/lib/calc/calc/calc.py | 26 +++++++++---------- .../calc/{calcfunctions.py => functions.py} | 0 3 files changed, 18 insertions(+), 13 deletions(-) rename common/lib/calc/calc/{calcfunctions.py => functions.py} (100%) diff --git a/common/lib/calc/calc/__init__.py b/common/lib/calc/calc/__init__.py index 5956cb38b538..e0d80d7b89f9 100644 --- a/common/lib/calc/calc/__init__.py +++ b/common/lib/calc/calc/__init__.py @@ -1 +1,6 @@ +""" +Ideally, we wouldn't need to pull in all the calc symbols here, +but courses were using 'import calc', so we need this for +backwards compatibility +""" from calc import * diff --git a/common/lib/calc/calc/calc.py b/common/lib/calc/calc/calc.py index ab300f121b0b..efb30f93d7fe 100644 --- a/common/lib/calc/calc/calc.py +++ b/common/lib/calc/calc/calc.py @@ -9,7 +9,7 @@ import numbers import numpy import scipy.constants -import calcfunctions +import functions from pyparsing import ( Word, Literal, CaselessLiteral, ZeroOrMore, MatchFirst, Optional, Forward, @@ -20,9 +20,9 @@ 'sin': numpy.sin, 'cos': numpy.cos, 'tan': numpy.tan, - 'sec': calcfunctions.sec, - 'csc': calcfunctions.csc, - 'cot': calcfunctions.cot, + 'sec': functions.sec, + 'csc': functions.csc, + 'cot': functions.cot, 'sqrt': numpy.sqrt, 'log10': numpy.log10, 'log2': numpy.log2, @@ -31,24 +31,24 @@ 'arccos': numpy.arccos, 'arcsin': numpy.arcsin, 'arctan': numpy.arctan, - 'arcsec': calcfunctions.arcsec, - 'arccsc': calcfunctions.arccsc, - 'arccot': calcfunctions.arccot, + 'arcsec': functions.arcsec, + 'arccsc': functions.arccsc, + 'arccot': functions.arccot, 'abs': numpy.abs, 'fact': math.factorial, 'factorial': math.factorial, 'sinh': numpy.sinh, 'cosh': numpy.cosh, 'tanh': numpy.tanh, - 'sech': calcfunctions.sech, - 'csch': calcfunctions.csch, - 'coth': calcfunctions.coth, + 'sech': functions.sech, + 'csch': functions.csch, + 'coth': functions.coth, 'arcsinh': numpy.arcsinh, 'arccosh': numpy.arccosh, 'arctanh': numpy.arctanh, - 'arcsech': calcfunctions.arcsech, - 'arccsch': calcfunctions.arccsch, - 'arccoth': calcfunctions.arccoth + 'arcsech': functions.arcsech, + 'arccsch': functions.arccsch, + 'arccoth': functions.arccoth } DEFAULT_VARIABLES = { 'i': numpy.complex(0, 1), diff --git a/common/lib/calc/calc/calcfunctions.py b/common/lib/calc/calc/functions.py similarity index 100% rename from common/lib/calc/calc/calcfunctions.py rename to common/lib/calc/calc/functions.py From 5b0194d9b48a4d2bfbfd77b4d704d30d9896cb5c Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Fri, 30 Aug 2013 10:43:31 -0400 Subject: [PATCH 4/4] bump version number on calc --- common/lib/calc/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/lib/calc/setup.py b/common/lib/calc/setup.py index 30f6427c0404..361884babf8c 100644 --- a/common/lib/calc/setup.py +++ b/common/lib/calc/setup.py @@ -2,7 +2,7 @@ setup( name="calc", - version="0.1.1", + version="0.2", packages=["calc"], install_requires=[ "pyparsing==1.5.6",