fix: some refactoring

.github/workflows/js-tests.yml

@@ -0,0 +1,34 @@
+name: Node CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  run_tests:
+    name: Tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install npm dependencies
+      run: npm install
+
+    - name: Run Js tests
+      run: make test-js 
+
+
+

.github/workflows/ci.yml → .github/workflows/python-tests.yml

@@ -39,9 +39,6 @@ jobs:
         export PATH=$PATH:$PWD/geckodriver
         export BOKCHOY_HEADLESS=true
 
-    - name: Install npm dependencies
-      run: npm install
-
     - name: Install dependencies
       run: |
         pip install -r requirements/base.txt
@@ -55,19 +52,11 @@ jobs:
         sudo mv firefox /opt/firefox
         sudo ln -s /opt/firefox/firefox /usr/bin/firefox
     
-    - name: Run tests
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django22' && always()
-      run: xvfb-run --server-args=-ac -- make test-js 
-      env:
-        BOKCHOY_HEADLESS: true
 
-    - name: Run tests
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django22' && always()
-      run: xvfb-run --auto-servernum  make test-python
+    - name: Run Pytest
+      run: make test-python
 
-    - name: Run tests
-
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django22' && always()
+    - name: Run Acceptance tests
       run: xvfb-run --server-args=-ac -- make test-bokchoy
       env:
         BOKCHOY_HEADLESS: true

requirements/base.in

@@ -9,4 +9,4 @@ PyContracts==1.7.1
 underscore.py==0.1.6
 pynliner==0.8.0
 git+https://github.com/milesrichardson/ParsePy.git
-freezegun>=0.1.11
+freezegun>=0.1.11

requirements/base.txt

@@ -26,4 +26,4 @@ six==1.15.0               # via parse-rest, python-dateutil
 soupsieve==2.1            # via beautifulsoup4
 sqlparse==0.4.1           # via django
 underscore.py==0.1.6      # via -r requirements/base.in
-urllib3==1.25.11          # via requests
+urllib3==1.25.11          # via requests

requirements/constraints.txt

@@ -9,4 +9,4 @@
 # linking to it here is good.
 
 # This file contains all common constraints for edx-repos
--c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

requirements/django.txt

@@ -1 +1 @@
-django==2.2.17            # via -r requirements/base.in, django-model-utils, djangorestframework
+django==2.2.17            # via -r requirements/base.in, django-model-utils, djangorestframework

requirements/pip.in

@@ -2,4 +2,4 @@
 
 pip
 setuptools
-wheel
+wheel

requirements/pip.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.36.2
+wheel==0.37.1
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==20.3.3
+pip==21.3.1
+    # via -r requirements/pip.in
+setuptools==60.2.0
     # via -r requirements/pip.in
-setuptools==51.3.3
-    # via -r requirements/pip.in

requirements/pip_tools.in

@@ -1,4 +1,4 @@
  # Dependencies to run compile tools
 -c constraints.txt
 
-pip-tools                           # Contains pip-compile, used to generate pip requirements files
+pip-tools                           # Contains pip-compile, used to generate pip requirements files

requirements/pip_tools.txt

@@ -4,10 +4,17 @@
 #
 #    make upgrade
 #
-click==7.1.2
+click==8.0.3
     # via pip-tools
-pip-tools==5.5.0
+pep517==0.12.0
+    # via pip-tools
+pip-tools==6.4.0
     # via -r requirements/pip_tools.in
+tomli==2.0.0
+    # via pep517
+wheel==0.37.1
+    # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
-# pip
+# pip
+# setuptools

requirements/testing.in

@@ -1,29 +1,17 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    make upgrade
-#
-beautifulsoup4==4.9.3     # via pynliner
-certifi==2020.12.5        # via requests
-chardet==3.0.4            # via requests
-cssutils==1.0.2           # via pynliner
-decorator==4.4.2          # via pycontracts
-django-model-utils==2.3.1  # via -r requirements/base.in
-django==2.2.17            # via -r requirements/base.in, django-model-utils, djangorestframework
-djangorestframework==3.11.0  # via -r requirements/base.in
-freezegun==1.0.0          # via -r requirements/base.in
-idna==2.8                 # via requests
-git+https://github.com/milesrichardson/ParsePy.git  # via -r requirements/base.in
-pycontracts==1.7.1        # via -r requirements/base.in
-pylru==1.0.6              # via -r requirements/base.in
-pynliner==0.8.0           # via -r requirements/base.in
-pyparsing==2.4.7          # via pycontracts
-python-dateutil==2.8.1    # via -r requirements/base.in, freezegun
-pytz==2020.4              # via django
-requests==2.22.0          # via -r requirements/base.in
-six==1.15.0               # via parse-rest, python-dateutil
-soupsieve==2.1            # via beautifulsoup4
-sqlparse==0.4.1           # via django
-underscore.py==0.1.6      # via -r requirements/base.in
-urllib3==1.25.11          # via requests
+-r base.txt # Core dependencies for this package
+
+# Testing Packages
+coverage
+astroid
+pytest-django
+httpretty==0.9.7
+pycodestyle
+pylint
+pydocstyle
+mock==1.0.1
+testfixtures==4.5.0
+bok-choy==0.6.2
+sure==1.2.3
+ddt==0.8.0
+selenium==2.53.1
+tox

requirements/testing.txt

@@ -59,4 +59,4 @@ tox==3.20.1               # via -r requirements/testing.in
 underscore.py==0.1.6      # via -r requirements/base.txt
 urllib3==1.25.11          # via -r requirements/base.txt, requests
 virtualenv==20.2.2        # via tox
-wrapt==1.12.1             # via astroid
+wrapt==1.12.1             # via astroid