Merge branch 'master' into manifest-file

Conflicts:
	setup.py

Author: theengineear

circle.yml

@@ -27,13 +27,14 @@ test:
     # run test suite in all our python versions
     - bash circle/test.sh
 
-#    # test that it imports when you don't have file permissions
-#    - sudo chmod 400 ${PLOTLY_CONFIG_DIR} && python -c "import plotly"
-#
-#    # test that setting permissions will work for import (and tests)
-#    - sudo chmod 600 ${PLOTLY_CONFIG_DIR} && python -c "import plotly"
+    # test that it imports when you don't have write permissions
+    - sudo chmod -R 444 ${PLOTLY_CONFIG_DIR} && python -c "import plotly"
+
+    # test that giving back write permissions works again
+    # this also has to pass the test suite that follows
+    - sudo chmod -R 777 ${PLOTLY_CONFIG_DIR} && python -c "import plotly"
 
     # test core things in the general 2.7 version that circle has
-    - nosetests -xv plotly/tests --with-coverage --cover-package=plotly
+    - nosetests -xv plotly/tests/test_core --with-coverage --cover-package=plotly
     - mkdir "${CIRCLE_ARTIFACTS}/2.7" || true
     - coverage html -d "${CIRCLE_ARTIFACTS}/2.7" --title=2.7

setup.py

@@ -34,7 +34,7 @@ def readme():
       packages=find_packages(),
       data_files=[(GRAPH_REFERENCE_DIR, GRAPH_REFERENCE_FILES),
                   (WIDGETS_DIR, WIDGETS_FILES)],
-      install_requires=['requests', 'six', 'pytz'],
+      install_requires=['requests[security]', 'six', 'pytz'],
       extras_require={"PY2.6": ['simplejson', 'ordereddict',
                                 'requests[security]']},
       zip_safe=False)