add images to binary search exploration. Modify an error message or two.

engaboda · Nov 17, 2013 · 61e363a · 61e363a
1 parent e6fd4bb
commit 61e363a
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 60 deletions.
diff --git a/data/explorations/binary_search/The Lazy Magician.yaml b/data/explorations/binary_search/The Lazy Magician.yaml
diff --git a/data/explorations/binary_search/assets/2tree.png b/data/explorations/binary_search/assets/2tree.png
diff --git a/data/explorations/binary_search/assets/3guessSeq1.png b/data/explorations/binary_search/assets/3guessSeq1.png
diff --git a/data/explorations/binary_search/assets/3guessSeq3.png b/data/explorations/binary_search/assets/3guessSeq3.png
diff --git a/data/explorations/binary_search/assets/3guessSeq4.png b/data/explorations/binary_search/assets/3guessSeq4.png
diff --git a/data/explorations/binary_search/assets/3guessSeq5.png b/data/explorations/binary_search/assets/3guessSeq5.png
diff --git a/data/explorations/binary_search/assets/3guessbigger.png b/data/explorations/binary_search/assets/3guessbigger.png
diff --git a/data/explorations/binary_search/assets/3tree-half.png b/data/explorations/binary_search/assets/3tree-half.png
diff --git a/data/explorations/binary_search/assets/3tree.png b/data/explorations/binary_search/assets/3tree.png
diff --git a/data/explorations/binary_search/assets/4tree-half.png b/data/explorations/binary_search/assets/4tree-half.png
diff --git a/data/explorations/binary_search/assets/Algorithm.png b/data/explorations/binary_search/assets/Algorithm.png
diff --git a/data/explorations/binary_search/assets/ThinkOf3.png b/data/explorations/binary_search/assets/ThinkOf3.png
diff --git a/data/explorations/binary_search/assets/magician-2.png b/data/explorations/binary_search/assets/magician-2.png
diff --git a/data/explorations/binary_search/assets/middleworst1-10.png b/data/explorations/binary_search/assets/middleworst1-10.png
diff --git a/data/explorations/binary_search/assets/pick7worst.png b/data/explorations/binary_search/assets/pick7worst.png
diff --git a/data/explorations/binary_search/assets/range0-11.png b/data/explorations/binary_search/assets/range0-11.png
diff --git a/data/explorations/binary_search/assets/range5-11.png b/data/explorations/binary_search/assets/range5-11.png
diff --git a/data/explorations/binary_search/assets/rangeadd5.png b/data/explorations/binary_search/assets/rangeadd5.png
diff --git a/scripts/start.sh b/scripts/start.sh
@@ -51,7 +51,8 @@ fi
 echo Checking if webtest is installed in third_party
 if [ ! -d "$TOOLS_DIR/webtest-1.4.2" ]; then
   echo Installing webtest framework
-  wget http://pypi.python.org/packages/source/W/WebTest/WebTest-1.4.2.zip -O webtest-download.zip
+  # a bug in older versions of wget prevents it from properly getting the certificate and downloading pypi
+  wget http://pypi.python.org/packages/source/W/WebTest/WebTest-1.4.2.zip --no-check-certificate -O webtest-download.zip
   unzip webtest-download.zip -d $TOOLS_DIR
   rm webtest-download.zip
   mv $TOOLS_DIR/WebTest-1.4.2 $TOOLS_DIR/webtest-1.4.2

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -42,7 +42,7 @@ echo Checking whether coverage is installed in $TOOLS_DIR
 if [ ! -d "$TOOLS_DIR/coverage-3.6" ]; then
   echo Installing coverage
   rm -rf $TOOLS_DIR/coverage || sudo rm -rf $TOOLS_DIR/coverage
-  wget http://pypi.python.org/packages/source/c/coverage/coverage-3.6.tar.gz#md5=67d4e393f4c6a5ffc18605409d2aa1ac -O coverage.tar.gz
+  wget --no-check-certificate http://pypi.python.org/packages/source/c/coverage/coverage-3.6.tar.gz#md5=67d4e393f4c6a5ffc18605409d2aa1ac -O coverage.tar.gz
   tar xvzf coverage.tar.gz -C $TOOLS_DIR
   rm coverage.tar.gz
 fi

diff --git a/utils.py b/utils.py
@@ -94,7 +94,7 @@ def get_exploration_components_from_dir(dir_path):
                                     'for %s' % dir_path)
                 elif not filepath.endswith('.yaml'):
                     raise Exception('The exploration data file should have a '
-                                    '.yaml suffix')
+                                    '.yaml suffix: %s' % filepath)
                 else:
                     yaml_content = get_file_contents(filepath)
             else: