Merge pull request #1 from datacamp/check_numpy_array

Check numpy array

Author: machow

.travis.yml

@@ -9,9 +9,9 @@ deploy:
   provider: pypi
   user: machow
   password:
-    secure: rln5w0ZBtGmleGD1rqkVnRZoP3dMtmya3Nz8yFFu/zudBzrUPu6dG3CjneVRPiSqh0Y6MqnnHOKMf4F69HG34o2jybhdCVrZfhSLUPcHDobUq9z2WC/dfAx0B0oALDP3qtbs80MeLwvoyC+OkaFESDee7CX/R4nGUdp7CDeoi3faNjzytAT0PprBHrVqxZpUPC7TMBL1wvyAhEcyWM/b8s1WDTHwfIu6KkumcAOqQbNCUsSScOOCuFKN/NtKVFEn+7ZWZ9kk6uaCGw6K+8Po55Zf+W0CZxHBQMvcYfEegMV7HXBr4V+KKnZSedwoeu4PNFmQyV07Ew7VH4VoS2pt88AeQaQv9XGuM+AReq6tIK9OZ341nYhvBaNr3jDteiPM4WRoHlLNqsRP6qLXXWvVbFxcDBUZpbZJSK3Xje+P1LxULz2UaU5XrIKLr/kA2m/WkTgBwDIPexXbHMx18H7fy8V+DrQGFlaKCDTPRm2kn7M5YgeIS+JAxhyTkJg6bRTBkbegmY8UATPD2XKcz/BKwgLQTO9MStf7jOvq5o1YKfaDSEUKwXTgdMk/EW5SGEGjTysDBXlKP6/nf1wiU9dXrBfj7yBHdfyQFkXFsZBEU+vj+HCmGdFkAJ4T8uueqtBmZ9g6F63izbkF/ojPSU84ObI6yeu29BIEIRNsnng8tms=
+    secure: fsSQjoVZw3vvbpfX06QlntVEnCbrkgkGtrvG4nvHCyhY/irXR99VRlaljfrcetGjZjiLPXY6w6mHS27WOaqxEK3XiWIsRscB05+RGWDUi+XDlql6jyYv/LbEb9ElCpghojV1f8AUvUAz31gEr/8bE5RIIqjeJXRma7clFpGIDFjS8YkvypUT5oG/4TQVikPvWiU7imVIkAigjV58bEeGFOBun8vBhYrYi7jd3Nx65V9HyQKPY7Tf+/t714Kcog9nn+cUyHnklEU4k65EIUc/jR2BuLgTKPtLDrOD58Q6ikGANe5ONBKIVWzhBOgH6lU6j8K6QADBiiXTsq0g8YC3/HqPu+3C5zGnrpP2Oq0BESBzx3Vp81iOKg7Y7Th3fpJo/G0rwGz8CTqmqINZpAhXC7LUN2udbUa9g65PxgatNLYdjG8PMOX+hCDGVgB/qu0bxas/HCdC29dYh1DU8tse7kiGFxL1c79jnSi3aUp2T0izTg16MVw5fGUaojY6MCGdK7lyPsIIwt01MIn6vh4wxp4xnX2vd2S2gMLx+yHemyqONFk42d0eoebEOagcPOZuVapejulAn5gkY7tle/cLL4L8y/MO3q69iJYoRUQYaFK8HCwPMHTNSCccVJwpeSBW7zoJzmz19EBeXzZTz8T4wm+6LdOJAVfJJswCZPIURro=
   on:
     tags: true
     distributions: sdist bdist_wheel
-    repo: datacamp/sqlwhat-ext
+    repo: datacamp/pythonwhat-ext
   skip_upload_docs: true

pythonwhat_ext.py

@@ -1 +1,21 @@
 __version__ = '0.0.0'
+
+from pythonwhat.check_syntax import state_dec, Ex
+import numpy as np
+
+@state_dec
+def check_numpy_array(name, state = None):
+    # is defined
+    obj = Ex(state).check_object(name)
+
+    # is a numpy array
+    obj.is_instance(np.ndarray)
+
+    # same shape
+    obj.has_equal_value(expr_code = '{:s}.shape'.format(name))
+
+    # equal contents
+    obj.has_equal_value()
+
+    # return object state for chaining
+    return obj

setup.py

@@ -14,7 +14,7 @@
 	name = 'pythonwhat-ext',
 	version = version,
         py_modules= ['pythonwhat_ext'],
-        install_requires = [],
+        install_requires = ['pythonwhat>=2.7'],
         description = 'pythonwhat extensions - high level SCTs',
         author = 'Michael Chow',
         author_email = 'michael@datacamp.com',

tests/helpers.py

@@ -0,0 +1,39 @@
+from pythonwhat.State import State
+from pythonwhat.Reporter import Reporter
+
+from IPython.core.interactiveshell import InteractiveShell
+
+class MockProcess:
+    """Mock the processes used in pythonbackend to evaluate code."""
+    def __init__(self, **kwargs):
+        self.shell = InteractiveShell(user_ns = kwargs)
+
+    def executeTask(self, task):
+        return task(self.shell)
+
+def create_state(solution_code="", student_code="", pre_exercise_code="",
+                 student_process = None, solution_process = None,
+                 raw_student_output="",
+                 reporter = None):
+    """Create a state for testing SCTs. 
+    
+    Custom processes are required for SCTs that execute code (e.g. has_equal_value).
+    See MockProcess above.
+    """
+    if reporter is None: reporter = Reporter()
+    Reporter.active_reporter = reporter
+    state =  State(full_student_code = student_code,
+                   full_solution_code = solution_code,
+                   **locals())
+
+    # only used to get converters :/
+    State.root_state = state
+
+    return state
+
+def create_x_state(stu_val, sol_val, **kwargs):
+    s = create_state(student_process = MockProcess(x = stu_val),
+                     solution_process = MockProcess(x = sol_val), 
+                     **kwargs)
+
+    return s

tests/test_check_numpy_array.py

@@ -0,0 +1,25 @@
+from pythonwhat_ext import check_numpy_array
+from pythonwhat.check_syntax import Ex
+from pythonwhat.Test import TestFail as TF
+
+import numpy as np
+
+import pytest
+from helpers import create_x_state
+
+def test_check_numpy_array():
+    state = create_x_state(np.array([1,2,3]), np.array([1,2,3]))
+    check_numpy_array("x", state = state)
+
+def test_check_numpy_array_fail():
+    state = create_x_state(np.array([1,2,3]), np.array([1,2]))
+    with pytest.raises(TF):
+        check_numpy_array("x", state = state)
+
+def test_ex_check_numpy_array():
+    state = create_x_state(np.array([1,2,3]), np.array([1,2, 3]))
+    Ex(state).multi(check_numpy_array('x'))
+
+def test_ex_rshift_check_numpy_array_fail():
+    state = create_x_state(np.array([1,2,3]), np.array([1,2]))
+    with pytest.raises(TF): Ex(state) >> check_numpy_array('x')