From 5c7fb7b72ac740d8b34f12f7348f5e4571a976ca Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Sun, 24 May 2015 19:37:01 -0700 Subject: [PATCH 1/5] Prevent InsecurePlatformWarning. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5b67b450378..dc598596bd7 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ def readme(): 'plotly/matplotlylib/mplexporter', 'plotly/matplotlylib/mplexporter/renderers'], package_data={'plotly': ['graph_reference/*.json', 'widgets/*.js']}, - install_requires=['requests', 'six', 'pytz'], + install_requires=['requests[security]', 'six', 'pytz'], extras_require={"PY2.6": ['simplejson', 'ordereddict', 'requests[security]']}, zip_safe=False) From 3fb909a0fe5768de4bf92df04504947c619dda1f Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Sun, 24 May 2015 19:40:37 -0700 Subject: [PATCH 2/5] This should only be testing core functionality. --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f4909428b1d..19236ef65ef 100644 --- a/circle.yml +++ b/circle.yml @@ -34,6 +34,6 @@ test: # - sudo chmod 600 ${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 From e1af13016c7f060b2b94c0dc66264cf9a9e0c7cb Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Sun, 24 May 2015 19:43:38 -0700 Subject: [PATCH 3/5] Add back in permissions tests. --- circle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 19236ef65ef..a704e6022ce 100644 --- a/circle.yml +++ b/circle.yml @@ -27,11 +27,11 @@ 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 444 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" + + # test that giving back write permissions works again + - sudo chmod 666 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" # test core things in the general 2.7 version that circle has - nosetests -xv plotly/tests/test_core --with-coverage --cover-package=plotly From 256311a77737b973d9f3eacf8fd00c58987a22ca Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Sun, 24 May 2015 19:57:40 -0700 Subject: [PATCH 4/5] Recursively chmod the plotly dir. --- circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index a704e6022ce..d63314bbad4 100644 --- a/circle.yml +++ b/circle.yml @@ -28,10 +28,11 @@ test: - bash circle/test.sh # test that it imports when you don't have write permissions - - sudo chmod 444 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" + - sudo chmod -R 444 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" # test that giving back write permissions works again - - sudo chmod 666 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" + # this also has to pass the test suite that follows + - sudo chmod -R 666 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" # test core things in the general 2.7 version that circle has - nosetests -xv plotly/tests/test_core --with-coverage --cover-package=plotly From d0f7b1ae17a8ba3de53e8d6a75b9859f07b6ac07 Mon Sep 17 00:00:00 2001 From: Andrew Seier Date: Sun, 24 May 2015 20:17:33 -0700 Subject: [PATCH 5/5] =?UTF-8?q?Give=20back=20permissions=20with=20?= =?UTF-8?q?=E2=80=98x=E2=80=99=20to=20allow=20dir=20use.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d63314bbad4..24515d3de41 100644 --- a/circle.yml +++ b/circle.yml @@ -32,7 +32,7 @@ test: # test that giving back write permissions works again # this also has to pass the test suite that follows - - sudo chmod -R 666 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" + - 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/test_core --with-coverage --cover-package=plotly