Merge pull request #401 from datacamp/feat/python_update

TimSangster · web-flow · commit fc51ac43ebf3 · 2021-09-16T11:02:46.000+02:00
[LO-2520] Feat/python update
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,16 @@
 sudo: false
 language: python
 python:
-- '3.5'
+- '3.9'
 before_install:
-- pip install -r requirements.txt
-- pip install -e .
+- pip3.9 install -r requirements.txt
+- pip3.9 install -e .
 script: pytest -m "not compiled" --cov=pythonwhat
-after_success: codecov --token=$CODECOV_TOKEN
 deploy:
   provider: pypi
   user: datacamp
   password:
-    secure: oyhm/R427TtmjJFMlvxQAR3UK5CA3vRSQd7CTtGTkL3W2zoZsPI7p3XbJn4CwC1f1XPdAbfN/Km035Fn4NlVHwJT54NTGkcy8GPV8whxEvWptiA1XWO6uwIqHh7rF/cVhX21AYXWAYkFq0Y0w1+q3OK75czMBrclwn9t+m111uoEUdZyowI5EVXbTHfzpNrRY3wA+tVWdz3Yd4IIC5foFsMP28j/5JCuMWXT1Knf53ZaoTSpyoEllAe/8sP/3K6/adgiwz5vL6kTFtSeuX0EQ6uvlXWyP4x8APNcnfVKxEC16iwakOgVzhw4n3uMsQ6tgo11w+A2crJU1N8KxdZtG8gAw42jWSZMmB3SHHx0NQhi71SvrjYXwDwe8bOvRFDHiR+2WQzoYC4WJUyn4WYpScazkQpeqYdoOTBnAr1VNzZHOQNwejX5KpLP15oXj6ima/lqefQWnIRixeBkJibSTdRl2HlvdPzP75DSjg8eA0Xt8/ad2oWV4om9zIUwAkJrnzih3ZsnshSqVZcxpsRDZvV2LXz39JzlNECqxfLGF+Oy6M8QQXnALzYuHhs/BgzPlLdQw8QLwHPqvv38LNfrWo36jR3j9UYu1/45LZauIEJuLGCyPclT1PDnAtxH3SGCEi8aAODzAi2qptbBHxJHjsRcVeMx6Oiz4AmEuxT4QRU=
+    secure: JrQnpSi03zbBXpRPYydm1K3539UYsn8tefJtWOm6mnoSl0/zeFU7s5vsVCu5LngmM3O1GzpfVQCh9BUC/1u+oDr7NpQ6zASBbNkwyb9sWj2eH/6fOBkLPhOIBspBTDr+LYOAvZC4+fr/7tb7OtiMzTKeAlRJRkj1LUmEbD8sbBdn5msDfY14AmhtTfA4MibsBlF3uzIDgpy4HaIJRw/YgZXcasB83Mxv5g242FHrCNUmbWJkaiSb+CRwcLqpCYg5B1hNLKA61IBi4Cpk6iM2XsP0LTk+TmS6hPZi3Qbdm6knkhhElbmKyXvANFrswrd4HbR8tRMBcOR/APlLqdVm6aKXF0E20rkcpVEdseSssJ/O+q0EiRe3033nupNseLNmQcQdGeOAoOIOkcKMySrM4eUK2XjZ4M+Uw9arZ+creMiIhzMYOoMnCrkXlyQkyz5X2qDW+HyTgl0aLUaOKGNaoJ7UJ78sGihx34tFaxI9sB6InZ3wF/lj1KbvQG66gMjIRVZ20AqLKWvUYCED6DzgPQ+T5IVG4GDezUSV8J/XZGDUnkN1z0zeQZo3UTinicriRzYgpzYhs4iZ1fXo4pw26xk69SQZauxr5jYrTWTygKvyPK6Qnpq7e4EXGYDQHNVevyYFic/kAvP+Aofly/38iK59AjBiKGeUr7SYTdag9N4=
   on:
     tags: true
     distributions: sdist bdist_wheel
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to the pythonwhat project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.24.0
+
+- Support Python version 3.9
+- Update dependencies to up-to-date versions
+
 ## 2.23.2
 
 - Update behaviour of has_expr() default feedback message. If the student's evaluation is too long, it is now shortened and an ellipsis is added. 
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # pythonwhat
 
 [![Build Status](https://travis-ci.org/datacamp/pythonwhat.svg?branch=master)](https://travis-ci.org/datacamp/pythonwhat)
-[![codecov](https://codecov.io/gh/datacamp/pythonwhat/branch/master/graph/badge.svg)](https://codecov.io/gh/datacamp/pythonwhat)
 [![PyPI version](https://badge.fury.io/py/pythonwhat.svg)](https://badge.fury.io/py/pythonwhat)
 [![Documentation Status](https://readthedocs.org/projects/pythonwhat/badge/?version=stable)](http://pythonwhat.readthedocs.io/en/stable/?badge=stable)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fdatacamp%2Fpythonwhat.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fdatacamp%2Fpythonwhat?ref=badge_shield)
@@ -54,9 +53,9 @@ To learn how to include an SCT in a DataCamp course, visit https://instructor-su
 ## Run tests
 
 ```bash
-pyenv local 3.5.2
-pip install -r requirements.txt
-pip install -e .
+pyenv local 3.9.6
+pip3.9 install -r requirements.txt
+pip3.9 install -e .
 pytest
 ```
 
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 testpaths = tests/
 addopts =-m "not compiled"
+markers =
+    slow
+    compiled
diff --git a/pythonwhat/Test.py b/pythonwhat/Test.py
@@ -1,6 +1,7 @@
 import re
 import numpy as np
 import pandas as pd
+from pandas.testing import assert_frame_equal, assert_series_equal
 from pythonwhat.tasks import *
 from protowhat.Test import Test
 
@@ -115,21 +116,19 @@ def is_equal(x, y):
             # Types of errors don't matter (this is debatable)
             return str(x) == str(y)
         if areinstance(x, y, (np.ndarray, dict, list, tuple)):
-            if np.array_equal(x, y):
-                return True
             np.testing.assert_equal(x, y)
             return True
         elif areinstance(x, y, (map, filter)):
             return np.array_equal(list(x), list(y))
         elif areinstance(x, y, (pd.DataFrame,)):
             if x.equals(y):
                 return True
-            pd.util.testing.assert_frame_equal(x, y)
+            assert_frame_equal(x, y)
             return True
         elif areinstance(x, y, (pd.Series,)):
             if x.equals(y):
                 return True
-            pd.util.testing.assert_series_equal(x, y)
+            assert_series_equal(x, y)
             return True
         else:
             return x == y
@@ -185,4 +184,4 @@ def test(self):
         if self.pattern:
             self.result = re.search(self.search_string, self.string) is not None
         else:
-            self.result = self.string.find(self.search_string) is not -1
+            self.result = self.string.find(self.search_string) != -1
diff --git a/pythonwhat/__init__.py b/pythonwhat/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "2.23.1"
+__version__ = "2.24.0"
 
 from .test_exercise import test_exercise, allow_errors
diff --git a/pythonwhat/converters.py b/pythonwhat/converters.py
@@ -6,6 +6,7 @@ def get_manual_converters():
 
     converters = {
         "pandas.io.excel.ExcelFile": lambda x: x.io,
+        "pandas.io.excel._base.ExcelFile": lambda x: x.io,
         "builtins.dict_keys": lambda x: sorted(x),
         "builtins.dict_items": lambda x: sorted(x),
         "bs4.BeautifulSoup": lambda x: str(x),
diff --git a/pythonwhat/utils_ast.py b/pythonwhat/utils_ast.py
@@ -4,7 +4,7 @@
 
 
 def wrap_in_module(node):
-    new_node = ast.Module(node)
+    new_node = ast.Module(node, [])
     if isinstance(node, list):
         if len(node) > 0:
             new_node.first_token = node[0].first_token
diff --git a/pythonwhat/utils_env.py b/pythonwhat/utils_env.py
@@ -10,7 +10,7 @@ def assign_from_ast(node, expr):
     """
     if isinstance(expr, str):
         expr = ast.Name(id=expr, ctx=ast.Load())
-    mod = ast.Module([ast.Assign(targets=[node], value=expr)])
+    mod = ast.Module([ast.Assign(targets=[node], value=expr)], [])
     ast.fix_missing_locations(mod)
     return compile(mod, "<assignment_script>", "exec")
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,30 +1,30 @@
 # pythonwhat deps
-protowhat~=2.0.1
-asttokens~=1.1.10
-dill~=0.2.7.1
-markdown2~=2.3.7
-jinja2~=2.10
+protowhat~=2.1.0
+asttokens~=2.0.5
+dill~=0.3.4
+markdown2~=2.3.10
+jinja2~=2.11.3
 
-numpy~=1.14.2
-pandas~=0.22.0
+numpy~=1.19.5
+pandas~=1.3.2
 
 # test deps
-scipy~=1.0.1
+scipy~=1.7.1
 bs4~=0.0.1
-html5lib~=1.0.1
-h5py~=2.7.1
-requests~=2.20.0
-seaborn~=0.8.1
-sqlalchemy~=1.3.0
-xlrd~=1.1.0
+html5lib~=1.1
+h5py~=3.1.0
+requests~=2.26.0
+seaborn~=0.11.2
+sqlalchemy~=1.4.23
+xlrd~=2.0.1
+openpyxl~=3.0.7
 
 # test-utils deps
-pytest~=5.3.2
-codecov~=2.0.15
-pytest-cov~=2.8.1
+pytest~=6.2.5
+pytest-cov~=2.12.1
 
 # building documentation
-sphinx~=1.8.3
-sphinx_rtd_theme~=0.3.1
-sphinx-jinja~=1.1.0
+sphinx~=4.1.2
+sphinx_rtd_theme~=0.5.2
+sphinx-jinja~=1.1.1
 sphinxprettysearchresults~=0.3.5
diff --git a/tests/test_check_function.py b/tests/test_check_function.py
@@ -212,6 +212,7 @@ def check_function_multiple_times():
 # Methods ---------------------------------------------------------------------
 
 
+# Manually create a signature for functions that need self passed
 def test_method_1():
     code = "df.groupby('b').sum()"
     s = setup_state(
@@ -221,26 +222,29 @@ def test_method_1():
     )
     helper.passes(s.check_function("df.groupby").check_args(0).has_equal_value())
     helper.passes(s.check_function("df.groupby.sum", signature=False))
-    from pythonwhat.signatures import sig_from_obj
-    import pandas as pd
 
+    import inspect
+    from inspect import Parameter as param
+    manual_sig = inspect.Signature([
+        param("x", param.POSITIONAL_OR_KEYWORD, default=None),
+        param("axis", param.POSITIONAL_OR_KEYWORD, default=None)
+    ])
     helper.passes(
-        s.check_function("df.groupby.sum", signature=sig_from_obj(pd.Series.sum))
+        s.check_function("df.groupby.sum", signature=manual_sig)
     )
 
 
 def test_method_2():
-    code = "df[df.b == 'x'].a.sum()"
+    code = "print('a')"
     s = setup_state(
         sol_code=code,
         stu_code=code,
-        pec="import pandas as pd; df = pd.DataFrame({'a': [1, 2, 3], 'b': ['x', 'x', 'y']})",
+        pec="",
     )
-    helper.passes(s.check_function("df.a.sum", signature=False))
-    from pythonwhat.signatures import sig_from_obj
-    import pandas as pd
+    helper.passes(s.check_function("print", signature=False))
 
-    helper.passes(s.check_function("df.a.sum", signature=sig_from_obj(pd.Series.sum)))
+    from pythonwhat.signatures import sig_from_obj
+    helper.passes(s.check_function("print", signature=sig_from_obj('print')))
 
 
 from pythonwhat.signatures import sig_from_params, param
diff --git a/tests/test_check_object.py b/tests/test_check_object.py
@@ -180,7 +180,7 @@ def test_check_keys_exotic(sct):
 
 
 def test_non_dillable():
-    # xlrd needed for Excel support
+    # xlrd and openpyxl needed for Excel support
     code = "xl = pd.ExcelFile('battledeath.xlsx')"
     res = helper.run(
         {
diff --git a/tests/test_debug.py b/tests/test_debug.py
@@ -1,5 +1,5 @@
-import requests
 import tests.helper as helper
+import json
 
 from protowhat.failure import InstructorError
 
@@ -21,13 +21,10 @@ def test_debug_on_error():
     # assert "SCT" in output["message"]
 
 
-def build_data(course_id, chapter_id, ex_number, printout=False):
-    url = "https://www.datacamp.com/api/courses/{course_id}/chapters/{chapter_id}/exercises.json".format(
-        course_id=course_id, chapter_id=chapter_id
-    )
-    resp = requests.get(url)
-    assert resp.status_code == 200
-    ex = resp.json()[ex_number - 1]
+def build_data(ex_number, printout=False):
+    # "https://www.datacamp.com/api/courses/735/chapters/1842/exercises.json"
+    with open('tests/test_debug_exercises.json') as exercises_json:
+        ex = json.load(exercises_json)[ex_number - 1]
 
     pec = ex.get("pre_exercise_code", "")
     sol = ex.get("solution", "")
@@ -60,6 +57,6 @@ def test_normal_pass():
 
 
 def test_dc_exercise():
-    data = build_data(735, 1842, 2)
+    data = build_data(2)
     output = helper.run(data)
     assert output["correct"]
diff --git a/tests/test_debug_exercises.json b/tests/test_debug_exercises.json
diff --git a/tests/test_test_with.py b/tests/test_test_with.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-__version__ = "2.23.1"`
	`1`	`+__version__ = "2.24.0"`
`2`	`2`
`3`	`3`	`from .test_exercise import test_exercise, allow_errors`