Update tox testing config for new directory structure

Author: jonmmease

.circleci/config.yml

@@ -15,7 +15,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py27-core'
+          command: 'cd plotly-package; tox -e py27-core'
           no_output_timeout: 20m
 
   python-3.5-core:
@@ -31,7 +31,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py35-core'
+          command: 'cd plotly-package; tox -e py35-core'
           no_output_timeout: 20m
 
   python-3.6-core:
@@ -47,7 +47,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py36-core'
+          command: 'cd plotly-package; tox -e py36-core'
           no_output_timeout: 20m
 
   python-3.7-core:
@@ -63,7 +63,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py37-core'
+          command: 'cd plotly-package; tox -e py37-core'
           no_output_timeout: 20m
 
   # Optional
@@ -84,7 +84,7 @@ jobs:
           no_output_timeout: 20m
       - run:
           name: Test with tox
-          command: 'tox -e py27-optional'
+          command: 'cd plotly-package; tox -e py27-optional'
           no_output_timeout: 20m
 
   python-3.5-optional:
@@ -104,7 +104,7 @@ jobs:
           no_output_timeout: 20m
       - run:
           name: Test with tox
-          command: 'tox -e py35-optional'
+          command: 'cd plotly-package; tox -e py35-optional'
           no_output_timeout: 20m
 
   python-3.6-optional:
@@ -124,7 +124,7 @@ jobs:
           no_output_timeout: 20m
       - run:
           name: Test with tox
-          command: 'tox -e py36-optional'
+          command: 'cd plotly-package; tox -e py36-optional'
           no_output_timeout: 20m
 
   python-3.7-optional:
@@ -144,7 +144,7 @@ jobs:
           no_output_timeout: 20m
       - run:
           name: Test with tox
-          command: 'tox -e py37-optional'
+          command: 'cd plotly-package; tox -e py37-optional'
           no_output_timeout: 20m
 
   # Plot.ly
@@ -161,7 +161,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py27-plot_ly'
+          command: 'cd chart-studio-package; tox -e py27-plot_ly'
           no_output_timeout: 20m
 
   python-3.5-plot_ly:
@@ -177,7 +177,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py35-plot_ly'
+          command: 'cd chart-studio-package; tox -e py35-plot_ly'
           no_output_timeout: 20m
 
   python-3.7-plot_ly:
@@ -193,7 +193,7 @@ jobs:
           command: 'sudo pip install tox'
       - run:
           name: Test with tox
-          command: 'tox -e py37-plot_ly'
+          command: 'cd chart-studio-package; tox -e py37-plot_ly'
           no_output_timeout: 20m
 
   python-2-7-orca:

chart-studio-package/setup.py

@@ -10,7 +10,7 @@ def readme():
 
 setup(
     name="chart-studio",
-    version="4.0.0a1",
+    version="1.0.0a1",
     author="Chris P",
     author_email="[email protected]",
     maintainer="Jon Mease",

chart-studio-package/tox.ini

@@ -0,0 +1,85 @@
+; Tox is a testing tool that manages virtualenvs for testing multiple Python
+; environments in a consistent/controlled way.
+
+; SETTING ENVIRONMENT VARIABLES AND TOX TESTING VARIABLES
+;
+; You can limit tox testing to certain environments via the `-e` (envlist)
+; command line option:
+;    tox -e py27-core,py34-core
+; OR, you can just set the `TOXENV` environment variable, which is handy:
+;    TOXENV=py27-core,py34-core
+;
+; Integrating with the virtualenvs in Circle CI is a bit of a pain. For
+; whatever reason the "executable" `python35` (at the time of writing) cannot
+; be activated directly. Instead the circle.yml file specifies the actual
+; binary directly. Because of this, you too have to set the following env
+; variables:
+;    PLOTLY_TOX_PYTHON_27=python2.7
+;    PLOTLY_TOX_PYTHON_34=python3.4
+;    ...
+; These will be specific to your machine and may not look like the ones above.
+; If you're not testing with all the python versions (see TOXENV above),
+; there's no need to install and map other versions.
+
+; PASSING ADDITONAL ARGUMENTS TO TEST COMMANDS
+; The {posargs} is tox-specific and passes in any command line args after `--`.
+; For example, given the testing command in *this* file:
+;   nosetests {posargs} -x plotly/tests/test_core
+;
+; The following command:
+;   tox -- -a '!slow'
+;
+; Tells tox to call:
+;   nosetests -a '!slow' -x plotly/tests/test_core
+;
+; Which is a nice way to skip slow tests for faster testing cycles.
+
+[tox]
+; The py{A,B,C}-{X,Y} generates a matrix of envs:
+;   pyA-X,pyA-Y,pyB-X,pyB-Y,pyC-X,pyC-Y
+envlist = py{27,34,37}-plot_ly
+
+; Note that envs can be targeted by deps using the <target>: dep syntax.
+; Only one dep is allowed per line as of the time of writing. The <target>
+; can be a `-` (hyphen) concatenated string of the environments to target
+; with the given dep.
+
+; These commands are general and will be run for *all* environments.
+[testenv]
+passenv=PLOTLY_TOX_*
+whitelist_externals=
+    mkdir
+deps=
+    coverage==4.3.1
+    decorator==4.0.9
+    mock==2.0.0
+    nose==1.3.7
+    requests==2.12.4
+    six==1.10.0
+    pytz==2016.10
+    retrying==1.3.3
+    pytest==3.5.1
+    backports.tempfile==1.0
+    plot_ly: pandas==0.23.2
+    plot_ly: numpy==1.14.3
+    plot_ly: ipywidgets==7.2.0
+    plot_ly: matplotlib==2.2.3
+
+; Plot.ly environments
+[testenv:py27-plot_ly]
+basepython={env:PLOTLY_TOX_PYTHON_27:}
+commands=
+    python --version
+    nosetests {posargs} -x chart_studio/tests/
+
+[testenv:py35-plot_ly]
+basepython={env:PLOTLY_TOX_PYTHON_35:}
+commands=
+    python --version
+    nosetests {posargs} -x chart_studio/tests/
+
+[testenv:py37-plot_ly]
+basepython={env:PLOTLY_TOX_PYTHON_37:}
+commands=
+    python --version
+    nosetests {posargs} -x chart_studio/tests/

tox.ini renamed to plotly-package/tox.ini

@@ -37,7 +37,7 @@
 [tox]
 ; The py{A,B,C}-{X,Y} generates a matrix of envs:
 ;   pyA-X,pyA-Y,pyB-X,pyB-Y,pyC-X,pyC-Y
-envlist = py{27,34,35,36,37}-{core,optional},py{27,34,37}-plot_ly
+envlist = py{27,34,35,36,37}-{core,optional},py{27,34,37}
 
 ; Note that envs can be targeted by deps using the <target>: dep syntax.
 ; Only one dep is allowed per line as of the time of writing. The <target>
@@ -74,10 +74,6 @@ deps=
     optional: matplotlib==2.2.3
     optional: xarray==0.10.9
     optional: scikit-image==0.13.1
-    plot_ly: pandas==0.23.2
-    plot_ly: numpy==1.14.3
-    plot_ly: ipywidgets==7.2.0
-    plot_ly: matplotlib==2.2.3
 
 ; CORE ENVIRONMENTS
 [testenv:py27-core]
@@ -150,22 +146,3 @@ commands=
     nosetests {posargs} -x plotly/tests/test_optional
     pytest _plotly_utils/tests/
     pytest plotly/tests/test_io
-
-; Plot.ly environments
-[testenv:py27-plot_ly]
-basepython={env:PLOTLY_TOX_PYTHON_27:}
-commands=
-    python --version
-    nosetests {posargs} -x chart_studio/tests/
-
-[testenv:py35-plot_ly]
-basepython={env:PLOTLY_TOX_PYTHON_35:}
-commands=
-    python --version
-    nosetests {posargs} -x chart_studio/tests/
-
-[testenv:py37-plot_ly]
-basepython={env:PLOTLY_TOX_PYTHON_37:}
-commands=
-    python --version
-    nosetests {posargs} -x chart_studio/tests/