Merge pull request #61 from datacamp/pyodide-package-updates

[CP-3515] [CP-3517] Pyodide package updates

.circleci/config.yml

@@ -11,7 +11,7 @@ jobs:
  - checkout
  - run:
  name: Install packages
- command: make install
+ command: make install-test
  - run:
  name: Run tests
  command: python -m pytest --cov=protowhat
@@ -29,10 +29,7 @@ jobs:
 workflows:
  build:
  jobs:
- - build-and-test:
- filters:
- tags:
- only: /^v\d+\.\d+\.\d+$/
+ - build-and-test
  - publish:
  requires:
  - build-and-test

.gitignore

@@ -77,3 +77,6 @@ target/
 
 # Mac stuff -------------------------------------------------------------------
 .DS_Store
+
+# IDE
+.idea

Makefile

@@ -10,6 +10,10 @@ install:
  pip3.9 install -e .
  pip3.9 install -r requirements.txt
 
+install-test:
+ pip3.9 install -e .
+ pip3.9 install -r requirements-test.txt
+
 ## test : run tests.
 test :
  pytest --cov=protowhat

protowhat/__init__.py

@@ -1 +1 @@
-__version__ = "2.1.3"
+__version__ = "2.2.0"

protowhat/checks/check_bash_history.py

@@ -93,7 +93,7 @@ def get_bash_history(full_history=False, bash_history_path=None):
 
 
 def has_command(state, pattern, msg, fixed=False, commands=None):
- """Test whether the bash history has a command matching the pattern
+ r"""Test whether the bash history has a command matching the pattern
 
  Args:
  state: State instance describing student and solution code. Can be omitted if used with Ex().

requirements-docs.txt

@@ -0,0 +1,4 @@
+-r requirements.txt
+
+sphinx~=4.1.2
+sphinx_rtd_theme~=0.5.2

requirements-test.txt

@@ -0,0 +1,5 @@
+-r requirements.txt
+
+pytest~=6.2.5
+pytest-cov~=2.12.1
+bashlex~=0.15

requirements.txt

@@ -1,14 +1,4 @@
-# protowhat deps
-markdown2==2.4.6
+markdown2==2.4.13
 Pygments==2.13.0
-jinja2~=2.11.3
-markupsafe==2.0.1
-
-# test deps
-pytest~=6.2.5
-pytest-cov~=2.12.1
-bashlex~=0.15
-
-# building documentation
-sphinx~=4.1.2
-sphinx_rtd_theme~=0.5.2
+jinja2~=3.1.2
+markupsafe==2.1.3