Merge pull request #10 from SALTISES4/trial-dev

Trial dev

.circleci/config.yml

@@ -10,19 +10,12 @@ jobs:
           command: |
             python3 -m venv test_venv
             . test_venv/bin/activate
-            pip install -r requirements.txt
+            pip install -r requirements/requirements.txt
             yarn install
             yarn run gulp build-js
-      - run:
-          name: Setup local_settings.py
-          command: |
-            echo 'SECRET_KEY = "Bzch875rhtrJnfnYml9vMiB4M70NJZKy"' > course_flow/local_settings.py
-            echo 'PASSWORD_KEY = "Bzch875rhtrJnfnYml9vMiB4M70NJZKy"' >> course_flow/local_settings.py
-            echo 'LTI_CLIENT_KEY = "edx"' >> course_flow/local_settings.py
-            echo 'LTI_CLIENT_SECRET = "Bzch875rhtrJnfnYml9vMiB4M70NJZKy"' >> course_flow/local_settings.py
       - run:
           name: Tests
           command: |
             . test_venv/bin/activate
             python3 course_flow.py migrate
-            python3 course_flow.py test
+            python3 -m pytest

.flake8

@@ -6,4 +6,7 @@ ignore = E203 \  # whitespace before ':'
          D101 \  # missing docstring in class
          D102 \  # missing docstring in method
          D103    # missing docstring in function
+per-file-ignores =
+  test_functional.py: F841
+  test_models.py: F841
 max-line-length = 88

.gitignore

@@ -1,3 +1,4 @@
+*.egg-info
 *.ipynb
 *.ipynb_checkpoints/
 *.log
@@ -9,6 +10,8 @@
 .data/
 .pytest_cache/
 .tern-port
+.tox/
+.venv
 *venv*/
 /CACHE
 /course_flow/local_settings.py
@@ -18,8 +21,9 @@
 /media
 /node_modules
 /sent_emails
-/server_static
 /static
+/server_static
+/*venv*/
 locust*
 logs
 mysql_scripts/
@@ -34,3 +38,6 @@ tags
 db.sqlite3
 db.sqlite3-journal
 local_settings.py
+
+#Local Scripts:
+*_local.sh

.pre-commit-config.yaml

@@ -1,18 +1,31 @@
 exclude: "^$"
 fail_fast: false
 repos:
+  - repo: https://github.com/pycqa/isort
+    rev: 5.6.4
+    hooks:
+      - id: isort
+        args: ["--profile", "black"]
   - repo: https://github.com/ambv/black
-    rev: 18.9b0
+    rev: 19.10b0
     hooks:
       - id: black
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.0.0
     hooks:
       - id: flake8
-
-  - repo: https://github.com/Lucas-C/pre-commit-hooks-safety
-    rev: v1.1.0
+  - repo: local
     hooks:
-      - id: python-safety-dependencies-check
+      - id: safety
+        name: safety
+        entry: safety check
+        language: system
+        always_run: true
+        exclude: ".*"
+      - id: npm-audit
+        name: npm-audit
+        language: system
+        entry: npm audit
         always_run: true
+        exclude: ".*"
+        verbose: true

MANIFEST.in

@@ -1,7 +1,16 @@
 include LICENSE
 include README.rst
-exclude course_flow/tests/*
-exclude course_flow/test*.py
-exclude course_flow/settings.py
-exclude course_flow/static/course_flow/js/scripts.js
-exclude course_flow/static/course_flow/template/registration/*
+
+include pytest.ini
+exclude course_flow/local_settings.py
+
+recursive-include course_flow/templates *
+recursive-exclude course_flow/templates/course_flow/registration *
+
+graft course_flow/tests
+graft course_flow/static/course_flow/css
+graft course_flow/static/course_flow/img
+graft course_flow/static/course_flow/js
+
+global-exclude *.pyc
+global-exclude __pycache__

README.md

@@ -48,8 +48,16 @@ CourseFlow is a pedagogical tool for planning activities, courses, and programs,
 
 11. Create default strategies.
 
-        (dev_venv) python3 cousre_flow.py create_instances course_flow/initial_data/template_strategies.json <username you registered under>
+        (dev_venv) python3 course_flow.py create_saltise_strategies
 
 12. For testing before commits, run:
 
         (dev_venv) python3 course_flow.py test
+
+    or:
+
+        (dev_venv) pytest
+
+13. To package a version:
+
+        tox --recreate

course_flow/admin.py

@@ -2,34 +2,38 @@
 
 from .models import (
     Node,
-    Strategy,
-    Activity,
-    Preparation,
-    Assessment,
-    Artifact,
-    Component,
+    Column,
     Week,
+    Activity,
     Course,
     Program,
-    NodeStrategy,
-    StrategyActivity,
-    ComponentWeek,
-    WeekCourse,
-    ComponentProgram,
+    NodeWeek,
+    NodeLink,
+    WeekWorkflow,
+    ColumnWorkflow,
+    Workflow,
+    Project,
+    WorkflowProject,
+    OutcomeProject,
+    Outcome,
+    OutcomeNode,
+    OutcomeOutcome,
+
 )
 
 admin.site.register(Node)
-admin.site.register(Strategy)
-admin.site.register(Activity)
-admin.site.register(Preparation)
-admin.site.register(Assessment)
-admin.site.register(Artifact)
-admin.site.register(Component)
+admin.site.register(Column)
+admin.site.register(ColumnWorkflow)
 admin.site.register(Week)
+admin.site.register(Activity)
 admin.site.register(Course)
 admin.site.register(Program)
-admin.site.register(NodeStrategy)
-admin.site.register(StrategyActivity)
-admin.site.register(ComponentWeek)
-admin.site.register(WeekCourse)
-admin.site.register(ComponentProgram)
+admin.site.register(NodeWeek)
+admin.site.register(NodeLink)
+admin.site.register(WeekWorkflow)
+admin.site.register(Workflow)
+admin.site.register(Project)
+admin.site.register(WorkflowProject)
+admin.site.register(Outcome)
+admin.site.register(OutcomeNode)
+admin.site.register(OutcomeOutcome)