CircleCI 2.0 migration

.circleci/config.yml

@@ -0,0 +1,252 @@
+version: 2
+
+jobs:
+  # Core
+  "python-2.7-core":
+    docker:
+      - image: circleci/python:2.7-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_27: python2.7
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py27-core'
+          no_output_timeout: 20m
+
+  "python-3.4-core":
+    docker:
+      - image: circleci/python:3.4-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_34: python3.4
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py34-core'
+          no_output_timeout: 20m
+
+  "python-3.5-core":
+    docker:
+      - image: circleci/python:3.5-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_35: python3.5
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py35-core'
+          no_output_timeout: 20m
+
+  "python-3.6-core":
+    docker:
+      - image: circleci/python:3.6-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_36: python3.6
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py36-core'
+          no_output_timeout: 20m
+
+  "python-3.7-core":
+    docker:
+      - image: circleci/python:3.7-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_37: python3.7
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py37-core'
+          no_output_timeout: 20m
+
+  # Optional
+  "python-2.7-optional":
+    docker:
+      - image: circleci/python:2.7-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_27: python2.7
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Install npm dependencies
+          command: cd plotly/tests/test_optional/test_jupyter && npm install
+          no_output_timeout: 20m
+      - run:
+          name: Test with tox
+          command: 'tox -e py27-optional'
+          no_output_timeout: 20m
+
+  "python-3.4-optional":
+    docker:
+      - image: circleci/python:3.4-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_34: python3.4
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Install npm dependencies
+          command: cd plotly/tests/test_optional/test_jupyter && npm install
+          no_output_timeout: 20m
+      - run:
+          name: Test with tox
+          command: 'tox -e py34-optional'
+          no_output_timeout: 20m
+
+  "python-3.5-optional":
+    docker:
+      - image: circleci/python:3.5-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_35: python3.5
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Install npm dependencies
+          command: cd plotly/tests/test_optional/test_jupyter && npm install
+          no_output_timeout: 20m
+      - run:
+          name: Test with tox
+          command: 'tox -e py35-optional'
+          no_output_timeout: 20m
+
+  "python-3.6-optional":
+    docker:
+      - image: circleci/python:3.6-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_36: python3.6
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Install npm dependencies
+          command: cd plotly/tests/test_optional/test_jupyter && npm install
+          no_output_timeout: 20m
+      - run:
+          name: Test with tox
+          command: 'tox -e py36-optional'
+          no_output_timeout: 20m
+
+  "python-3.7-optional":
+    docker:
+      - image: circleci/python:3.7-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_37: python3.7
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Install npm dependencies
+          command: cd plotly/tests/test_optional/test_jupyter && npm install
+          no_output_timeout: 20m
+      - run:
+          name: Test with tox
+          command: 'tox -e py37-optional'
+          no_output_timeout: 20m
+
+  # Plot.ly
+  "python-2.7-plot_ly":
+    docker:
+      - image: circleci/python:2.7-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_27: python2.7
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py27-plot_ly'
+          no_output_timeout: 20m
+
+  "python-3.4-plot_ly":
+    docker:
+      - image: circleci/python:3.4-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_34: python3.4
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py34-plot_ly'
+          no_output_timeout: 20m
+
+  "python-3.7-plot_ly":
+    docker:
+      - image: circleci/python:3.7-stretch-node-browsers
+        environment:
+          PLOTLY_TOX_PYTHON_37: python3.7
+
+    steps:
+      - checkout
+      - run:
+          name: Install tox
+          command: 'sudo pip install tox'
+      - run:
+          name: Test with tox
+          command: 'tox -e py37-plot_ly'
+          no_output_timeout: 20m
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - "python-2.7-core"
+      - "python-3.4-core"
+      - "python-3.5-core"
+      - "python-3.6-core"
+      - "python-3.7-core"
+      - "python-2.7-optional"
+      - "python-3.4-optional"
+      - "python-3.5-optional"
+      - "python-3.6-optional"
+      # 3.7 optional disabled due to current shapely incompatibility
+      # - "python-3.7-optional"
+      - "python-2.7-plot_ly"
+      - "python-3.4-plot_ly"
+      - "python-3.7-plot_ly"

_plotly_utils/tests/validators/test_angle_validator.py

@@ -1,4 +1,5 @@
 import pytest
+#from ..basevalidators import AngleValidator
 from _plotly_utils.basevalidators import AngleValidator
 import numpy as np
 
@@ -33,7 +34,7 @@ def test_coercion(val, expected, validator):
 # ### Test rejection ###
 @pytest.mark.parametrize('val',
                          ['hello', (), [], [1, 2, 3], set(), '34'])
-def test_rejection(val, validator: AngleValidator):
+def test_rejection(val, validator):
     with pytest.raises(ValueError) as validation_failure:
         validator.validate_coerce(val)
 

_plotly_utils/tests/validators/test_any_validator.py

@@ -21,7 +21,7 @@ def validator_aok():
 @pytest.mark.parametrize('val', [
     set(), 'Hello', 123, np.inf, np.nan, {}
 ])
-def test_acceptance(val, validator: AnyValidator):
+def test_acceptance(val, validator):
     assert validator.validate_coerce(val) is val
 
 
@@ -36,7 +36,7 @@ def test_acceptance(val, validator: AnyValidator):
     ['Hello', 'World'],
     [np.pi, np.e, {}]
 ])
-def test_acceptance_array(val, validator_aok: AnyValidator):
+def test_acceptance_array(val, validator_aok):
     coerce_val = validator_aok.validate_coerce(val)
     if isinstance(val, np.ndarray):
         assert isinstance(coerce_val, np.ndarray)

_plotly_utils/tests/validators/test_basetraces_validator.py

@@ -16,7 +16,7 @@ def validator():
 
 # Tests
 # -----
-def test_acceptance(validator: BaseDataValidator):
+def test_acceptance(validator):
     val = [Scatter(mode='lines'), Box(fillcolor='yellow')]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -36,7 +36,7 @@ def test_acceptance(validator: BaseDataValidator):
     assert res_present[0].uid != res_present[1].uid
 
 
-def test_acceptance_dict(validator: BaseDataValidator):
+def test_acceptance_dict(validator):
     val = (dict(type='scatter', mode='lines'),
            dict(type='box', fillcolor='yellow'))
     res = validator.validate_coerce(val)
@@ -56,7 +56,7 @@ def test_acceptance_dict(validator: BaseDataValidator):
     assert res_present[0].uid != res_present[1].uid
 
 
-def test_default_is_scatter(validator: BaseDataValidator):
+def test_default_is_scatter(validator):
     val = [dict(mode='lines')]
     res = validator.validate_coerce(val)
     res_present = validator.present(res)
@@ -68,7 +68,7 @@ def test_default_is_scatter(validator: BaseDataValidator):
     assert res_present[0].mode == 'lines'
 
 
-def test_rejection_type(validator: BaseDataValidator):
+def test_rejection_type(validator):
     val = 37
 
     with pytest.raises(ValueError) as validation_failure:
@@ -77,7 +77,7 @@ def test_rejection_type(validator: BaseDataValidator):
     assert "Invalid value" in str(validation_failure.value)
 
 
-def test_rejection_element_type(validator: BaseDataValidator):
+def test_rejection_element_type(validator):
     val = [42]
 
     with pytest.raises(ValueError) as validation_failure:
@@ -86,7 +86,7 @@ def test_rejection_element_type(validator: BaseDataValidator):
     assert "Invalid element(s)" in str(validation_failure.value)
 
 
-def test_rejection_element_attr(validator: BaseDataValidator):
+def test_rejection_element_attr(validator):
     val = [dict(type='scatter', bogus=99)]
 
     with pytest.raises(ValueError) as validation_failure:
@@ -97,7 +97,7 @@ def test_rejection_element_attr(validator: BaseDataValidator):
             str(validation_failure.value))
 
 
-def test_rejection_element_tracetype(validator: BaseDataValidator):
+def test_rejection_element_tracetype(validator):
     val = [dict(type='bogus', a=4)]
 
     with pytest.raises(ValueError) as validation_failure: