Skip to content

Commit 7c7a272

Browse files
committed
Revert 3.8 CI updates. Too much for this PR
1 parent 619838f commit 7c7a272

File tree

2 files changed

+45
-47
lines changed

2 files changed

+45
-47
lines changed

.circleci/config.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
command: "cd packages/python/plotly; tox -e py27-core"
3232
no_output_timeout: 20m
3333

34-
python-3.6-core:
34+
python-3.5-core:
3535
docker:
36-
- image: circleci/python:3.6-stretch-node-browsers
36+
- image: circleci/python:3.5-stretch-node-browsers
3737
environment:
38-
PLOTLY_TOX_PYTHON_36: python3.6
38+
PLOTLY_TOX_PYTHON_35: python3.5
3939

4040
steps:
4141
- checkout
@@ -44,14 +44,14 @@ jobs:
4444
command: "sudo pip install tox"
4545
- run:
4646
name: Test with tox
47-
command: "cd packages/python/plotly; tox -e py36-core"
47+
command: "cd packages/python/plotly; tox -e py35-core"
4848
no_output_timeout: 20m
4949

50-
python-3.7-core:
50+
python-3.6-core:
5151
docker:
52-
- image: circleci/python:3.7-stretch-node-browsers
52+
- image: circleci/python:3.6-stretch-node-browsers
5353
environment:
54-
PLOTLY_TOX_PYTHON_37: python3.7
54+
PLOTLY_TOX_PYTHON_36: python3.6
5555

5656
steps:
5757
- checkout
@@ -60,14 +60,14 @@ jobs:
6060
command: "sudo pip install tox"
6161
- run:
6262
name: Test with tox
63-
command: "cd packages/python/plotly; tox -e py37-core"
63+
command: "cd packages/python/plotly; tox -e py36-core"
6464
no_output_timeout: 20m
6565

66-
python-3.8-core:
66+
python-3.7-core:
6767
docker:
68-
- image: circleci/python:3.8.7
68+
- image: circleci/python:3.7-stretch-node-browsers
6969
environment:
70-
PLOTLY_TOX_PYTHON_38: python3.8
70+
PLOTLY_TOX_PYTHON_37: python3.7
7171

7272
steps:
7373
- checkout
@@ -76,7 +76,7 @@ jobs:
7676
command: "sudo pip install tox"
7777
- run:
7878
name: Test with tox
79-
command: "cd packages/python/plotly; tox -e py38-core"
79+
command: "cd packages/python/plotly; tox -e py37-core"
8080
no_output_timeout: 20m
8181

8282
python-3.7-percy:
@@ -128,11 +128,11 @@ jobs:
128128
command: "cd packages/python/plotly; tox -e py27-optional"
129129
no_output_timeout: 20m
130130

131-
python-3.6-optional:
131+
python-3.5-optional:
132132
docker:
133-
- image: circleci/python:3.6-stretch-node-browsers
133+
- image: circleci/python:3.5-stretch-node-browsers
134134
environment:
135-
PLOTLY_TOX_PYTHON_36: python3.6
135+
PLOTLY_TOX_PYTHON_35: python3.5
136136

137137
steps:
138138
- checkout
@@ -141,14 +141,14 @@ jobs:
141141
command: "sudo pip install tox"
142142
- run:
143143
name: Test with tox
144-
command: "cd packages/python/plotly; tox -e py36-optional"
144+
command: "cd packages/python/plotly; tox -e py35-optional"
145145
no_output_timeout: 20m
146146

147-
python-3.7-optional:
147+
python-3.6-optional:
148148
docker:
149-
- image: circleci/python:3.7-stretch-node-browsers
149+
- image: circleci/python:3.6-stretch-node-browsers
150150
environment:
151-
PLOTLY_TOX_PYTHON_37: python3.7
151+
PLOTLY_TOX_PYTHON_36: python3.6
152152

153153
steps:
154154
- checkout
@@ -157,14 +157,14 @@ jobs:
157157
command: "sudo pip install tox"
158158
- run:
159159
name: Test with tox
160-
command: "cd packages/python/plotly; tox -e py37-optional"
160+
command: "cd packages/python/plotly; tox -e py36-optional"
161161
no_output_timeout: 20m
162162

163-
python-3.8-optional:
163+
python-3.7-optional:
164164
docker:
165-
- image: circleci/python:3.8.7
165+
- image: circleci/python:3.7-stretch-node-browsers
166166
environment:
167-
PLOTLY_TOX_PYTHON_38: python3.8
167+
PLOTLY_TOX_PYTHON_37: python3.7
168168

169169
steps:
170170
- checkout
@@ -173,7 +173,7 @@ jobs:
173173
command: "sudo pip install tox"
174174
- run:
175175
name: Test with tox
176-
command: "cd packages/python/plotly; tox -e py38-optional"
176+
command: "cd packages/python/plotly; tox -e py37-optional"
177177
no_output_timeout: 20m
178178

179179
# Plot.ly
@@ -255,23 +255,23 @@ jobs:
255255
- store_artifacts:
256256
path: plotly/tests/test_orca/images/linux/failed
257257

258-
python-3-6-orca:
258+
python-3-5-orca:
259259
docker:
260260
- image: circleci/node:10.9-stretch-browsers
261261
environment:
262-
PYTHON_VERSION: 3.6
262+
PYTHON_VERSION: 3.5
263263

264264
steps:
265265
- checkout
266266
- restore_cache:
267267
keys:
268-
- conda-36-v1-{{ checksum ".circleci/create_conda_optional_env.sh" }}
268+
- conda-35-v1-{{ checksum ".circleci/create_conda_optional_env.sh" }}
269269
- run:
270270
name: Create conda environment
271271
command: .circleci/create_conda_optional_env.sh
272272

273273
- save_cache:
274-
key: conda-36-v1-{{ checksum ".circleci/create_conda_optional_env.sh" }}
274+
key: conda-35-v1-{{ checksum ".circleci/create_conda_optional_env.sh" }}
275275
paths:
276276
- /home/circleci/miniconda/
277277
- run:
@@ -518,14 +518,14 @@ workflows:
518518
build:
519519
jobs:
520520
- python-2.7-core
521+
- python-3.5-core
521522
- python-3.6-core
522523
- python-3.7-core
523-
- python-3.8-core
524524
- python-3.7-percy
525525
- python-2.7-optional
526+
- python-3.5-optional
526527
- python-3.6-optional
527528
- python-3.7-optional
528-
- python-3.8-optional
529529
- python-3.7-plot_ly
530530
- python-2-7-orca
531531
- python-3-7-orca

packages/python/plotly/tox.ini

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
[tox]
3737
; The py{A,B,C}-{X,Y} generates a matrix of envs:
3838
; pyA-X,pyA-Y,pyB-X,pyB-Y,pyC-X,pyC-Y
39-
envlist = py{27,36,37,38}-{core,optional},py{27,37}
39+
envlist = py{27,34,35,36,37}-{core,optional},py{27,34,37}
4040

4141
; Note that envs can be targeted by deps using the <target>: dep syntax.
4242
; Only one dep is allowed per line as of the time of writing. The <target>
@@ -57,8 +57,7 @@ deps=
5757
pytz==2016.10
5858
retrying==1.3.3
5959
pytest==3.5.1
60-
pandas==0.24.2;python_version<"3.0"
61-
pandas==1.2.0;python_version>"3.5"
60+
pandas==0.24.2
6261
xarray==0.10.9
6362
statsmodels==0.10.2
6463
pillow==5.2.0
@@ -74,8 +73,7 @@ deps=
7473
optional: geopandas==0.3.0
7574
optional: pyshp==1.2.10
7675
optional: matplotlib==2.2.3
77-
optional: scikit-image==0.14.4;python_version<"3.0"
78-
optional: scikit-image==0.18.1;python_version>"3.5"
76+
optional: scikit-image==0.14.4
7977
optional: kaleido
8078
optional: orjson==3.4.6;python_version>"3.5"
8179

@@ -86,6 +84,12 @@ commands=
8684
python --version
8785
pytest {posargs} plotly/tests/test_core
8886

87+
[testenv:py35-core]
88+
basepython={env:PLOTLY_TOX_PYTHON_35:}
89+
commands=
90+
python --version
91+
pytest {posargs} plotly/tests/test_core
92+
8993
[testenv:py36-core]
9094
basepython={env:PLOTLY_TOX_PYTHON_36:}
9195
commands=
@@ -100,12 +104,6 @@ commands=
100104
pytest {posargs} -x test_init/test_dependencies_not_imported.py
101105
pytest {posargs} -x test_init/test_lazy_imports.py
102106

103-
[testenv:py38-core]
104-
basepython={env:PLOTLY_TOX_PYTHON_38:}
105-
commands=
106-
python --version
107-
pytest {posargs} plotly/tests/test_core
108-
109107
; OPTIONAL ENVIRONMENTS
110108
;[testenv:py27-optional]
111109
;basepython={env:PLOTLY_TOX_PYTHON_27:}
@@ -126,26 +124,26 @@ commands=
126124
pytest _plotly_utils/tests/
127125
pytest plotly/tests/test_io
128126

129-
[testenv:py36-optional]
130-
basepython={env:PLOTLY_TOX_PYTHON_36:}
127+
[testenv:py35-optional]
128+
basepython={env:PLOTLY_TOX_PYTHON_35:}
131129
commands=
132130
python --version
133131
pytest {posargs} plotly/tests/test_core
134132
pytest {posargs} plotly/tests/test_optional
135133
pytest _plotly_utils/tests/
136134
pytest plotly/tests/test_io
137135

138-
[testenv:py37-optional]
139-
basepython={env:PLOTLY_TOX_PYTHON_37:}
136+
[testenv:py36-optional]
137+
basepython={env:PLOTLY_TOX_PYTHON_36:}
140138
commands=
141139
python --version
142140
pytest {posargs} plotly/tests/test_core
143141
pytest {posargs} plotly/tests/test_optional
144142
pytest _plotly_utils/tests/
145143
pytest plotly/tests/test_io
146144

147-
[testenv:py38-optional]
148-
basepython={env:PLOTLY_TOX_PYTHON_38:}
145+
[testenv:py37-optional]
146+
basepython={env:PLOTLY_TOX_PYTHON_37:}
149147
commands=
150148
python --version
151149
pytest {posargs} plotly/tests/test_core

0 commit comments

Comments
 (0)