Skip to content

Commit e840a9f

Browse files
authored
V4 chart studio extraction (plotly#1597)
* Move plotly package under plotly-package directory * Move codegen, submodules, templategen to plotly-package directory * remove unused example images directory * optional import of chart_studio in src validator * Move figure factory tests to plotly-figure-factory-package * Split out plotly/package_data into the appropriate distribution package * Update setup.py packages * Update codegen for new directory structure * Update setup.py tasks for new directory structure * Add license file per subproject * Move figure_factory module back into plotly package and extract the geo shape files into a _plotly_geo data package * Remove legacy graph_reference module * Update test_offline to not depend on working directory * Update config.yml test * Update test_offline paths * CI updates * Remove plotly.tests import in chart_studio tests * Install plotly-geo-package
1 parent 2a44ce3 commit e840a9f

File tree

1,457 files changed

+5012
-1238
lines changed

Some content is hidden

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

1,457 files changed

+5012
-1238
lines changed

.circleci/config.yml

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
command: 'sudo pip install tox'
1616
- run:
1717
name: Test with tox
18-
command: 'tox -e py27-core'
18+
command: 'cd plotly-package; tox -e py27-core'
1919
no_output_timeout: 20m
2020

2121
python-3.5-core:
@@ -31,7 +31,7 @@ jobs:
3131
command: 'sudo pip install tox'
3232
- run:
3333
name: Test with tox
34-
command: 'tox -e py35-core'
34+
command: 'cd plotly-package; tox -e py35-core'
3535
no_output_timeout: 20m
3636

3737
python-3.6-core:
@@ -47,7 +47,7 @@ jobs:
4747
command: 'sudo pip install tox'
4848
- run:
4949
name: Test with tox
50-
command: 'tox -e py36-core'
50+
command: 'cd plotly-package; tox -e py36-core'
5151
no_output_timeout: 20m
5252

5353
python-3.7-core:
@@ -63,7 +63,7 @@ jobs:
6363
command: 'sudo pip install tox'
6464
- run:
6565
name: Test with tox
66-
command: 'tox -e py37-core'
66+
command: 'cd plotly-package; tox -e py37-core'
6767
no_output_timeout: 20m
6868

6969
# Optional
@@ -80,11 +80,11 @@ jobs:
8080
command: 'sudo pip install tox'
8181
- run:
8282
name: Install npm dependencies
83-
command: cd plotly/tests/test_optional/test_jupyter && npm install
83+
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
8484
no_output_timeout: 20m
8585
- run:
8686
name: Test with tox
87-
command: 'tox -e py27-optional'
87+
command: 'cd plotly-package; tox -e py27-optional'
8888
no_output_timeout: 20m
8989

9090
python-3.5-optional:
@@ -100,11 +100,11 @@ jobs:
100100
command: 'sudo pip install tox'
101101
- run:
102102
name: Install npm dependencies
103-
command: cd plotly/tests/test_optional/test_jupyter && npm install
103+
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
104104
no_output_timeout: 20m
105105
- run:
106106
name: Test with tox
107-
command: 'tox -e py35-optional'
107+
command: 'cd plotly-package; tox -e py35-optional'
108108
no_output_timeout: 20m
109109

110110
python-3.6-optional:
@@ -120,11 +120,11 @@ jobs:
120120
command: 'sudo pip install tox'
121121
- run:
122122
name: Install npm dependencies
123-
command: cd plotly/tests/test_optional/test_jupyter && npm install
123+
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
124124
no_output_timeout: 20m
125125
- run:
126126
name: Test with tox
127-
command: 'tox -e py36-optional'
127+
command: 'cd plotly-package; tox -e py36-optional'
128128
no_output_timeout: 20m
129129

130130
python-3.7-optional:
@@ -140,11 +140,11 @@ jobs:
140140
command: 'sudo pip install tox'
141141
- run:
142142
name: Install npm dependencies
143-
command: cd plotly/tests/test_optional/test_jupyter && npm install
143+
command: cd plotly-package/plotly/tests/test_optional/test_jupyter && npm install
144144
no_output_timeout: 20m
145145
- run:
146146
name: Test with tox
147-
command: 'tox -e py37-optional'
147+
command: 'cd plotly-package; tox -e py37-optional'
148148
no_output_timeout: 20m
149149

150150
# Plot.ly
@@ -161,7 +161,7 @@ jobs:
161161
command: 'sudo pip install tox'
162162
- run:
163163
name: Test with tox
164-
command: 'tox -e py27-plot_ly'
164+
command: 'cd chart-studio-package; tox -e py27-plot_ly'
165165
no_output_timeout: 20m
166166

167167
python-3.5-plot_ly:
@@ -177,7 +177,7 @@ jobs:
177177
command: 'sudo pip install tox'
178178
- run:
179179
name: Test with tox
180-
command: 'tox -e py35-plot_ly'
180+
command: 'cd chart-studio-package; tox -e py35-plot_ly'
181181
no_output_timeout: 20m
182182

183183
python-3.7-plot_ly:
@@ -193,7 +193,7 @@ jobs:
193193
command: 'sudo pip install tox'
194194
- run:
195195
name: Test with tox
196-
command: 'tox -e py37-plot_ly'
196+
command: 'cd chart-studio-package; tox -e py37-plot_ly'
197197
no_output_timeout: 20m
198198

199199
python-2-7-orca:
@@ -220,8 +220,8 @@ jobs:
220220
command: |
221221
. /home/circleci/miniconda/etc/profile.d/conda.sh
222222
conda activate circle_optional
223-
pytest --disable-warnings plotly/tests/test_core
224-
pytest plotly/tests/test_orca
223+
pytest --disable-warnings plotly-package/plotly/tests/test_core
224+
pytest plotly-package/plotly/tests/test_orca
225225
226226
- store_artifacts:
227227
path: plotly/tests/test_orca/images/linux/failed
@@ -250,8 +250,8 @@ jobs:
250250
command: |
251251
. /home/circleci/miniconda/etc/profile.d/conda.sh
252252
conda activate circle_optional
253-
pytest --disable-warnings plotly/tests/test_core
254-
pytest plotly/tests/test_orca
253+
pytest --disable-warnings plotly-package/plotly/tests/test_core
254+
pytest plotly-package/plotly/tests/test_orca
255255
256256
- store_artifacts:
257257
path: plotly/tests/test_orca/images/linux/failed
@@ -280,8 +280,8 @@ jobs:
280280
command: |
281281
. /home/circleci/miniconda/etc/profile.d/conda.sh
282282
conda activate circle_optional
283-
pytest --disable-warnings plotly/tests/test_core
284-
pytest plotly/tests/test_orca
283+
pytest --disable-warnings plotly-package/plotly/tests/test_core
284+
pytest plotly-package/plotly/tests/test_orca
285285
286286
- store_artifacts:
287287
path: plotly/tests/test_orca/images/linux/failed
@@ -300,19 +300,21 @@ jobs:
300300
command: 'sudo pip install tox requests yapf pytz decorator retrying inflect'
301301
- run:
302302
name: Update plotlywidget version
303-
command: 'python setup.py updateplotlywidgetversion'
303+
command: 'cd plotly-package; python setup.py updateplotlywidgetversion'
304304
- run:
305305
name: Update plotly.js to dev
306-
command: 'python setup.py updateplotlyjsdev'
306+
command: 'cd plotly-package; python setup.py updateplotlyjsdev'
307307
- run:
308308
name: Test with tox
309309
command: |
310+
cd plotly-package
310311
locale
311312
tox -e py37-core -- -a '!nodev'
312313
no_output_timeout: 20m
313314
- run:
314315
name: Commit
315316
command: |
317+
cd plotly-package
316318
sudo mkdir /dist
317319
git config --global user.email "[email protected]"
318320
git config --global user.name "Your Name"
@@ -322,6 +324,7 @@ jobs:
322324
- run:
323325
name: Build source distribution package
324326
command: |
327+
cd plotly-package
325328
python setup.py sdist
326329
sudo cp dist/* /dist
327330
when: always
@@ -334,7 +337,7 @@ jobs:
334337
sudo cp ./plotlywidget* /dist
335338
when: always
336339
- store_artifacts:
337-
path: /dist
340+
path: plotly-package/dist
338341

339342
workflows:
340343
version: 2

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,5 @@ plotly.egg-info/
3535

3636
plotly/tests/test_orca/images/*/failed
3737
plotly/tests/test_orca/images/*/tmp
38+
/plotly-package/plotly/tests/test_core/test_offline/plotly.min.js
39+
/plotly-package/plotly/tests/test_core/test_offline/temp-plot.html
File renamed without changes.

0 commit comments

Comments
 (0)