Merge pull request #154 from plotly/circle-redux

Circle redux

Author: theengineear

circle.yml

@@ -0,0 +1,33 @@
+machine:
+  environment:
+    PLOTLY_PACKAGE_ROOT: /home/ubuntu/python-api
+    PLOTLY_CONFIG_DIR: ${HOME}/.plotly
+    PLOTLY_PYTHON_VERSIONS: 2.6.8 2.7.8 3.3.3 3.4.1
+    PLOTLY_CORE_REQUIREMENTS_FILE: ${PLOTLY_PACKAGE_ROOT}/requirements.txt
+    PLOTLY_OPTIONAL_REQUIREMENTS_FILE: ${PLOTLY_PACKAGE_ROOT}/optional-requirements.txt
+    PLOTLY_OPTIONAL_REQUIREMENTS_FILE_2_6: ${PLOTLY_PACKAGE_ROOT}/optional-requirements-2-6.txt
+dependencies:
+  pre:
+    # run all the pre-written installers (this will take a *while*)
+    - bash circle/setup.sh
+    # install testing tools for circle's version of things
+    - PYENV_VERSION=2.7 && pip install nose coverage
+  override:
+    - PYENV_VERSION=2.7 && pip install -I .
+    - PYENV_VERSION=2.7 && cd ~ && python -c "import plotly"
+test:
+  override:
+
+    # 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 core things in the general 2.7 version that circle has
+    - PYENV_VERSION=2.7 && nosetests -xv plotly/tests --with-coverage --cover-package=plotly
+    - mkdir "${CIRCLE_ARTIFACTS}/2.7" || true
+    - coverage html -d "${CIRCLE_ARTIFACTS}/2.7" --title=2.7

circle/setup.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+echo "running setup routine with python versions:"
+for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
+    echo "    ${version}"
+done
+
+PROGNAME=$(basename $0)
+function error_exit
+{
+    echo -e "${PROGNAME}: ${1:-"Unknown Error"}\n" 1>&2
+    exit 1
+}
+
+# for each version we want, setup a functional virtual environment
+for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
+    echo Setting up Python ${version}
+
+    # exporting this variable (in this scope) chooses the python version
+    export PYENV_VERSION=${version}
+    echo "Using pyenv version $(pyenv version)"
+
+    # install core requirements all versions need
+    pip install -r ${PLOTLY_CORE_REQUIREMENTS_FILE} ||
+        error_exit "${LINENO}: can't install core reqs for Python ${version}"
+
+    # handle funkiness around python 2.6
+    if [ ${version:0:3} == '2.6' ]
+    then
+        pip install simplejson ordereddict ||
+            error_exit "${LINENO}: can't install extras for Python ${version}"
+        pip install -r ${PLOTLY_OPTIONAL_REQUIREMENTS_FILE_2_6} ||
+            error_exit "${LINENO}: can't install optional for Python ${version}"
+    else
+        pip install -r ${PLOTLY_OPTIONAL_REQUIREMENTS_FILE} ||
+            error_exit "${LINENO}: can't install optional for Python ${version}"
+    fi
+
+    # install some test tools
+    pip install nose coverage ||
+        error_exit "${LINENO}: can't install test tools for Python ${version}"
+done

circle/test.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+echo "running test routine with python versions:"
+for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
+    echo "    ${version}"
+done
+
+PROGNAME=$(basename $0)
+function error_exit
+{
+    echo -e "${PROGNAME}: ${1:-"Unknown Error"}\n" 1>&2
+    exit 1
+}
+
+# for each version we want, setup a functional virtual environment
+for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
+    echo Testing Python ${version}
+
+    # exporting this variable (in this scope) chooses the python version
+    export PYENV_VERSION=${version}
+    echo "Using pyenv version $(pyenv version)"
+
+    echo "install plotly (ignoring possibly cached versions)"
+    pip install -I ${PLOTLY_PACKAGE_ROOT} ||
+        error_exit "${LINENO}: can't install plotly package from project root"
+
+    echo "import plotly to create .plotly dir if DNE"
+    python -c 'import plotly' ||
+        error_exit "${LINENO}: can't import plotly package"
+
+#    echo "${HOME}"
+#    echo "${PLOTLY_CONFIG_DIR}"
+#
+#    # test that it imports when you don't have write permissions
+#    sudo chmod -R 444 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" ||
+#        error_exit "${LINENO}: permissions test 444 on .plotly dir failed"
+#
+#    # test that setting write permissions will work for import (and tests)
+#    sudo chmod -R 666 ${PLOTLY_CONFIG_DIR} && python -c "import plotly" ||
+#        error_exit "${LINENO}: permissions test 666 on .plotly dir failed"
+
+    echo "running tests for Python ${version} as user '$(whoami)'"
+    nosetests -xv plotly/tests --with-coverage --cover-package=plotly ||
+        error_exit "${LINENO}: test suite failed for Python ${version}"
+    mkdir "${CIRCLE_ARTIFACTS}/${PYENV_VERSION}" || true
+    coverage html -d "${CIRCLE_ARTIFACTS}/${PYENV_VERSION}" \
+        --title=${PYENV_VERSION}
+
+done

optional-requirements-2-6.txt

@@ -0,0 +1,18 @@
+### Optional Dependencies for Additional Plotly Functionality   ###
+###                                                             ###
+### To install, run:                                            ###
+###      $ pip install -r optional-requirements.txt             ###
+###                                                             ###
+###################################################################
+
+## numpy (technically, this is covered by matplotlib's deps) ##
+numpy
+
+## matplotlylib dependencies ##
+matplotlib==1.3.1
+
+## testing dependencies ##
+nose==1.3.3
+
+## pandas deps for some matplotlib functionality ##
+pandas

plotly/exceptions.py

@@ -69,7 +69,7 @@ def __str__(self):
 NON_UNIQUE_COLUMN_MESSAGE = (
     "Yikes, plotly grids currently "
     "can't have duplicate column names. Rename "
-    "the column \"{}\" and try again."
+    "the column \"{0}\" and try again."
 )
 ## Would Cause Server Errors ##
 

plotly/grid_objs/grid_objs.py

@@ -33,7 +33,7 @@ def __str__(self):
         return string.format(name=self.name, data=data_string, id=self.id)
 
     def __repr__(self):
-        return 'Column("{}", {})'.format(self.data, self.name)
+        return 'Column("{0}", {1})'.format(self.data, self.name)
 
     def to_plotly_json(self):
         return {'name': self.name, 'data': self.data}

plotly/matplotlylib/mpltools.py

@@ -386,7 +386,7 @@ def prep_ticks(ax, index, ax_type, props):
                     for i in range(1, len(dticks) - 1)]):
                 dtick = tickvalues[1] - tickvalues[0]
             else:
-                warnings.warn("'linear' {}-axis tick spacing not even, "
+                warnings.warn("'linear' {0}-axis tick spacing not even, "
                               "ignoring mpl tick formatting.".format(ax_type))
                 raise TypeError
         except (IndexError, TypeError):
@@ -413,7 +413,7 @@ def prep_ticks(ax, index, ax_type, props):
                                  math.log10(props['ylim'][1])]
         else:
             axis_dict = dict(range=None, type='linear')
-            warnings.warn("Converted non-base10 {}-axis log scale to 'linear'"
+            warnings.warn("Converted non-base10 {0}-axis log scale to 'linear'"
                           "".format(ax_type))
     else:
         return dict()

plotly/tests/test_core/test_plotly/test_plot.py

@@ -62,8 +62,8 @@ class TestPlot(TestCase):
 
     def test_plot_empty_data(self):
         py.sign_in('PlotlyImageTest', '786r5mecv0')
-        with self.assertRaises(PlotlyEmptyDataError):
-            py.plot([], filename='plot_invalid')
+        self.assertRaises(PlotlyEmptyDataError, py.plot, [],
+                          filename='plot_invalid')
 
 
 def test_bar():

plotly/version.py

@@ -1 +1 @@
-__version__ = '1.4.5'
+__version__ = '1.4.6'