Skip to content

Commit df7e2a6

Browse files
authored
Merge branch 'doc-prod' into patch-1
2 parents 803d441 + fe7833a commit df7e2a6

File tree

4,557 files changed

+262919
-35411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,557 files changed

+262919
-35411
lines changed

Diff for: .circleci/config.yml

+77-42
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
version: 2.1
22

33
orbs:
4-
browser-tools: circleci/[email protected].1
4+
browser-tools: circleci/[email protected].8
55

66
commands:
77
test_core:
88
parameters:
99
py:
10-
default: "36"
10+
default: "310"
1111
type: string
1212
steps:
1313
- checkout
@@ -32,7 +32,7 @@ commands:
3232
test_optional:
3333
parameters:
3434
py:
35-
default: "36"
35+
default: "310"
3636
type: string
3737
steps:
3838
- checkout
@@ -95,7 +95,7 @@ commands:
9595
test_orca:
9696
parameters:
9797
py:
98-
default: "36"
98+
default: "310"
9999
type: string
100100
steps:
101101
- checkout
@@ -153,20 +153,6 @@ jobs:
153153
black --check . --exclude venv
154154
155155
# Core
156-
python_36_core:
157-
docker:
158-
- image: cimg/python:3.6-browsers
159-
steps:
160-
- test_core:
161-
py: "36"
162-
163-
python_37_core:
164-
docker:
165-
- image: cimg/python:3.7-browsers
166-
steps:
167-
- test_core:
168-
py: "37"
169-
170156
python_38_core:
171157
docker:
172158
- image: cimg/python:3.8-browsers
@@ -181,20 +167,28 @@ jobs:
181167
- test_core:
182168
py: "39"
183169

184-
# Optional
185-
python_36_optional:
170+
python_310_core:
186171
docker:
187-
- image: cimg/python:3.6-browsers
172+
- image: cimg/python:3.10-browsers
188173
steps:
189-
- test_optional:
190-
py: "36"
174+
- test_core:
175+
py: "310"
191176

192-
python_37_optional:
177+
python_311_core:
193178
docker:
194-
- image: cimg/python:3.7-browsers
179+
- image: cimg/python:3.11-browsers
195180
steps:
196-
- test_optional:
197-
py: "37"
181+
- test_core:
182+
py: "311"
183+
184+
python_312_core:
185+
docker:
186+
- image: cimg/python:3.12-browsers
187+
steps:
188+
- test_core:
189+
py: "312"
190+
191+
# Optional
198192

199193
python_38_optional:
200194
docker:
@@ -210,6 +204,27 @@ jobs:
210204
- test_optional:
211205
py: "39"
212206

207+
python_310_optional:
208+
docker:
209+
- image: cimg/python:3.10-browsers
210+
steps:
211+
- test_optional:
212+
py: "310"
213+
214+
python_311_optional:
215+
docker:
216+
- image: cimg/python:3.11-browsers
217+
steps:
218+
- test_optional:
219+
py: "311"
220+
221+
python_312_optional:
222+
docker:
223+
- image: cimg/python:3.12-browsers
224+
steps:
225+
- test_optional:
226+
py: "312"
227+
213228
# Pandas
214229

215230
python_39_pandas_2_optional:
@@ -219,6 +234,21 @@ jobs:
219234
- test_optional:
220235
py: "39_pandas_2"
221236

237+
# No numpy
238+
python_312_no_numpy:
239+
docker:
240+
- image: cimg/python:3.12-browsers
241+
steps:
242+
- run:
243+
name: Check that numpy is not installed
244+
command: |
245+
if pip list | grep numpy > /dev/null 2>&1
246+
then exit 1
247+
else exit 0
248+
fi
249+
- test_optional:
250+
py: "312_no_numpy"
251+
222252
# Orca
223253
python_38_orca:
224254
docker:
@@ -228,7 +258,7 @@ jobs:
228258
py: "38"
229259

230260
# Percy
231-
python_37_percy:
261+
python_39_percy:
232262
docker:
233263
- image: cimg/python:3.9-browsers
234264
environment:
@@ -277,9 +307,9 @@ jobs:
277307
rm test/percy/*.html
278308
279309
# Chart studio
280-
python_37_chart_studio:
310+
python_38_chart_studio:
281311
docker:
282-
- image: cimg/python:3.7
312+
- image: cimg/python:3.8
283313
resource_class: large
284314

285315
steps:
@@ -291,7 +321,7 @@ jobs:
291321
python -m venv venv
292322
. venv/bin/activate
293323
pip install --upgrade pip wheel
294-
pip install -r ./test_requirements/requirements_37.txt
324+
pip install -r ./test_requirements/requirements_38.txt
295325
- run:
296326
name: Tests
297327
command: |
@@ -302,7 +332,7 @@ jobs:
302332

303333
plotlyjs_dev_build:
304334
docker:
305-
- image: cimg/python:3.7-node
335+
- image: cimg/python:3.8-node
306336
environment:
307337
LANG: en_US.UTF-8
308338
resource_class: large
@@ -316,7 +346,7 @@ jobs:
316346
python -m venv venv
317347
. venv/bin/activate
318348
pip install --upgrade pip wheel
319-
pip install -r ./test_requirements/requirements_37_core.txt black inflect
349+
pip install -r ./test_requirements/requirements_38_core.txt black inflect
320350
pip install jupyterlab~=3.0
321351
- run:
322352
name: Update jupyterlab-plotly version
@@ -359,7 +389,7 @@ jobs:
359389

360390
full_build:
361391
docker:
362-
- image: continuumio/miniconda3
392+
- image: continuumio/miniconda3:24.3.0-0
363393
environment:
364394
LANG: en_US.UTF-8
365395
resource_class: large
@@ -370,7 +400,9 @@ jobs:
370400
- run:
371401
name: Create conda environment
372402
command: |
373-
conda create -n env --yes python=3.9 conda-build conda-verify
403+
conda config --remove channels defaults
404+
conda config --add channels conda-forge
405+
conda create -n env --yes python=3.9 conda-build=3.28.4 conda-verify
374406
conda install -n env -c conda-forge jupyterlab=3 nodejs=16
375407
conda init bash
376408
mkdir output
@@ -432,8 +464,8 @@ jobs:
432464
resource_class: xlarge
433465
docker:
434466
# specify the version you desire here
435-
# use `-browsers` prefix for selenium tests, for example, `3.6.1-browsers`
436-
- image: cimg/python:3.7-browsers
467+
# use `-browsers` prefix for selenium tests, for example, `3.9-browsers`
468+
- image: cimg/python:3.9-browsers
437469

438470
steps:
439471
- add_ssh_keys:
@@ -570,15 +602,18 @@ workflows:
570602

571603
build:
572604
jobs:
573-
- python_36_core
574-
- python_37_core
575605
- python_38_core
576606
- python_39_core
577-
- python_36_optional
578-
- python_37_optional
607+
- python_310_core
608+
- python_311_core
609+
- python_312_core
579610
- python_38_optional
580611
- python_39_optional
612+
- python_310_optional
613+
- python_311_optional
614+
- python_312_optional
581615
- python_39_pandas_2_optional
582616
- python_38_orca
583-
- python_37_percy
617+
- python_39_percy
618+
- python_312_no_numpy
584619
- build-doc

Diff for: .flake8

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
max-line-length = 88

Diff for: .gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0
2+
0.html
3+
iframe_figures/
4+
packages/python/plotly/plotly/tests/test_orca/images/linux/failed/
5+
16
*.egg-info
27

38
*.pyc
@@ -6,6 +11,8 @@
611

712
*~
813

14+
doc/python/raw.githubusercontent.com/
15+
916
# Don't ignore dataset files
1017
!*.csv.gz
1118

0 commit comments

Comments
 (0)