Update docs

Author: machow

docs/environment.yml

@@ -0,0 +1,5 @@
+name: py35
+dependencies:
+- python=3.5.1=0
+- sphinx>1.4.0
+- sphinx_rtd_theme>=0.1.9

docs/source/Processes.md

@@ -1,5 +1,16 @@
-Processes
-=========
+Expressions
+===========
+
+[TODO: Managing Processes taken from wiki, will update with spec2 functions]
+
+`has_equal` Syntax
+------------------
+
+`call` Syntax
+-------------
+
+Managing Processes
+-----------------
 
 As mentioned on the [wiki Homepage](https://github.com/datacamp/pythonwhat/wiki), DataCamp uses two separate processes. One process to run the solution code, and one process to run the student's submission. This way, `pythonwhat` has access to the 'ideal ending scenario' of an exercises; this makes it easier to write SCTs. Instead of having to specify which value an object should be, we can have `test_object()` look into the solution process and compare the object in that process with the object in the student process.
 

docs/source/conf.py

@@ -15,15 +15,22 @@
 import sys
 import os
 
+# Mock heavy duty pythonwhat dependencies for autodoc
+import mock
+ 
+MOCK_MODULES = ['numpy', 'pandas', 'dill', 'markdown2']
+for mod_name in MOCK_MODULES:
+    sys.modules[mod_name] = mock.Mock()
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../..'))
+
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+#needs_sphinx = '1.3.5'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

docs/source/index.rst

@@ -8,11 +8,13 @@ Contents:
    :maxdepth: 2
 
    Home
-   quickstart_guide
-   test_functions
-   parts_cheatsheet
+   quickstart_guide.md
+   simple_tests.md
+   parts_cheatsheet.rst
    Processes
-   Sub-SCTs
+   logic
+   spec2_summary
+   test_functions
 
 Indices and tables
 ==================

docs/source/Sub-SCTs.md docs/source/logic.mddocs/source/Sub-SCTs.md renamed to docs/source/logic.md

@@ -1,6 +1,8 @@
-Composite SCTs
+Logic
 ==============
 
+[TODO: this is a previous version, will update with spec2 functions]
+
 Several functions, such as `test_correct()`, `test_or()`, `test_function_definition()`, among others, also have arguments that expect another set of tests. This article will explain the different ways of specifying these 'sub-tests'.
 
 Let's take the example of `test_correct()`; this function takes two sets of tests. The first set is executed, and if it's fine, the second set is left alone. If the first set of tests results in an error, the second set is executed and the feedback is logged.