Skip to content

Commit 5813a8a

Browse files
authored
Merge pull request #5002 from plotly/simplify-dir-structure
Move `packages/python/plotly` to top level
2 parents 9910078 + 9e15334 commit 5813a8a

File tree

15,197 files changed

+655
-689
lines changed

Some content is hidden

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

15,197 files changed

+655
-689
lines changed

.circleci/config.yml

+12-33
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ commands:
1616
- run:
1717
name: Install dependencies
1818
command: |
19-
cd packages/python/plotly
2019
python -m venv venv
2120
. venv/bin/activate
2221
pip install --upgrade pip wheel
2322
pip install -r ./test_requirements/requirements_<<parameters.py>>_core.txt
2423
- run:
2524
name: Test core
2625
command: |
27-
cd packages/python/plotly
2826
. venv/bin/activate
2927
pytest plotly/tests/test_core
3028
no_output_timeout: 20m
@@ -41,7 +39,6 @@ commands:
4139
- run:
4240
name: Install dependencies
4341
command: |
44-
cd packages/python/plotly
4542
python -m venv venv
4643
. venv/bin/activate
4744
pip install --upgrade pip wheel
@@ -52,47 +49,40 @@ commands:
5249
- run:
5350
name: Install plotly-geo
5451
command: |
55-
cd packages/python/plotly
5652
. venv/bin/activate
5753
pip install plotly-geo
5854
- run:
5955
name: Test core
6056
command: |
61-
cd packages/python/plotly
6257
. venv/bin/activate
6358
pytest plotly/tests/test_core
6459
no_output_timeout: 20m
6560
- run:
6661
name: Test optional
6762
command: |
68-
cd packages/python/plotly
6963
. venv/bin/activate
7064
pytest plotly/tests/test_optional
7165
no_output_timeout: 40m
7266
- run:
7367
name: Test utils
7468
command: |
75-
cd packages/python/plotly
7669
. venv/bin/activate
7770
pytest _plotly_utils/tests/
7871
no_output_timeout: 20m
7972
- run:
8073
name: Test io
8174
command: |
82-
cd packages/python/plotly
8375
. venv/bin/activate
8476
pytest plotly/tests/test_io
8577
no_output_timeout: 20m
8678
- run:
8779
name: Test dependencdies not imported
8880
command: |
89-
cd packages/python/plotly
9081
. venv/bin/activate
9182
pytest -x test_init/test_dependencies_not_imported.py
9283
- run:
9384
name: Test lazy imports
9485
command: |
95-
cd packages/python/plotly
9686
. venv/bin/activate
9787
pytest -x test_init/test_lazy_imports.py
9888
test_orca:
@@ -107,15 +97,13 @@ commands:
10797
- run:
10898
name: Install dependencies
10999
command: |
110-
cd packages/python/plotly
111100
python -m venv venv
112101
. venv/bin/activate
113102
pip install --upgrade pip wheel
114103
pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
115104
- run:
116105
name: Install plotly-geo
117106
command: |
118-
cd packages/python/plotly
119107
. venv/bin/activate
120108
pip install plotly-geo
121109
- run:
@@ -129,12 +117,11 @@ commands:
129117
- run:
130118
name: Test orca
131119
command: |
132-
cd packages/python/plotly
133120
. venv/bin/activate
134121
pytest plotly/tests/test_orca
135122
no_output_timeout: 20m
136123
- store_artifacts:
137-
path: packages/python/plotly/plotly/tests/test_orca/images/linux/failed
124+
path: plotly/tests/test_orca/images/linux/failed
138125

139126
jobs:
140127
check-code-formatting:
@@ -283,9 +270,9 @@ jobs:
283270
python -m venv venv
284271
. venv/bin/activate
285272
pip install --upgrade pip wheel
286-
pip install -e ./packages/python/plotly
273+
pip install -e .
287274
pip install plotly-geo
288-
pip install -r ./packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt
275+
pip install -r test_requirements/requirements_39_pandas_2_optional.txt
289276
290277
- run:
291278
name: Build html figures (Pandas 2)
@@ -322,7 +309,6 @@ jobs:
322309
- run:
323310
name: Install dependencies
324311
command: |
325-
cd packages/python/plotly
326312
python -m venv venv
327313
. venv/bin/activate
328314
pip install --upgrade pip wheel
@@ -331,27 +317,23 @@ jobs:
331317
- run:
332318
name: Update jupyter widget plotly.js version
333319
command: |
334-
cd packages/python/plotly
335320
. venv/bin/activate
336321
python setup.py updateplotlywidgetversion
337322
- run:
338323
name: Update plotly.js to dev
339324
command: |
340-
cd packages/python/plotly
341325
. venv/bin/activate
342326
python setup.py updateplotlyjsdev
343327
- run:
344328
name: Test core
345329
command: |
346-
cd packages/python/plotly
347330
. venv/bin/activate
348331
locale
349332
pytest -k 'not nodev' plotly/tests/test_core
350333
no_output_timeout: 20m
351334
- run:
352335
name: Commit
353336
command: |
354-
cd packages/python/plotly
355337
git config --global user.email "[email protected]"
356338
git config --global user.name "Your Name"
357339
git add -A
@@ -360,12 +342,11 @@ jobs:
360342
- run:
361343
name: Build source distribution packages
362344
command: |
363-
cd packages/python/plotly
364345
. venv/bin/activate
365346
python setup.py sdist
366347
when: always
367348
- store_artifacts:
368-
path: packages/python/plotly/dist
349+
path: dist/
369350

370351
full_build:
371352
docker:
@@ -392,7 +373,7 @@ jobs:
392373
command: |
393374
eval "$(conda shell.bash hook)"
394375
conda activate env
395-
cd packages/python/plotly/js
376+
cd js
396377
npm ci
397378
npm run build
398379
git status
@@ -402,27 +383,25 @@ jobs:
402383
command: |
403384
eval "$(conda shell.bash hook)"
404385
conda activate env
405-
cd packages/python/plotly
406386
python setup.py sdist bdist_wheel
407-
cp -R dist ../../../output/dist
387+
cp -R dist output/dist
408388
git status
409389
410390
- run:
411391
name: Conda Build
412392
command: |
413393
eval "$(conda shell.bash hook)"
414394
conda activate env
415-
cd packages/python/plotly
416395
conda build recipe/
417-
mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 ../../../output
396+
mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 output/
418397
git status
419398
420399
- run:
421400
name: Build Widget javascript bundle
422401
command: |
423402
eval "$(conda shell.bash hook)"
424403
conda activate env
425-
cd packages/python/plotly/js
404+
cd js
426405
npm ci
427406
npm run build
428407
@@ -471,12 +450,12 @@ jobs:
471450
pip install -r requirements.txt
472451
if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
473452
pip uninstall -y plotly
474-
cd ../packages/python/plotly
453+
cd ..
475454
pip install -e .
476455
cd js
477456
npm ci
478457
npm run build
479-
cd ../../../../doc
458+
cd ../doc
480459
fi
481460
cd ..
482461
- run:
@@ -553,9 +532,9 @@ jobs:
553532
# graph_objs/graph_objects
554533
if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
555534
pip uninstall -y plotly
556-
cd ../packages/python/plotly
535+
cd ..
557536
pip install -e .
558-
cd ../../../doc
537+
cd doc
559538
cd apidoc
560539
make html
561540
cd _build/html

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
packages/python/plotly/plotly/_version.py export-subst
1+
plotly/_version.py export-subst

.gitignore

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
0
22
0.html
33
iframe_figures/
4-
packages/python/plotly/plotly/tests/test_orca/images/linux/failed/
4+
plotly/tests/test_orca/images/linux/failed/
55

66
*.egg-info
77

@@ -15,6 +15,7 @@ doc/python/raw.githubusercontent.com/
1515

1616
# Don't ignore dataset files
1717
!*.csv.gz
18+
!*.geojson.gz
1819

1920
*.ipynb
2021

@@ -59,10 +60,9 @@ doc/.ipynb_checkpoints
5960
tags
6061
doc/check-or-enforce-order.py
6162

62-
packages/javascript/jupyterlab-plotly/lib/
63-
packages/python/plotly/jupyterlab_plotly/labextension/
64-
packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
65-
packages/python/plotly/plotly/package_data/widgetbundle.js
63+
jupyterlab_plotly/labextension/
64+
jupyterlab_plotly/nbextension/index.js*
65+
plotly/package_data/widgetbundle.js
6666

6767
test/percy/*.html
6868
test/percy/pandas2/*.html
File renamed without changes.

README.md

+2
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/python/plotly/codegen/__init__.py codegen/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def perform_codegen():
9090
# ---------------------------------
9191
# (relative to project root)
9292
abs_file_path = opath.realpath(__file__)
93-
packages_py = opath.dirname(opath.dirname(opath.dirname(abs_file_path)))
94-
outdir = opath.join(packages_py, "plotly", "plotly")
93+
project_root = opath.dirname(opath.dirname(abs_file_path))
94+
outdir = opath.join(project_root, "plotly")
9595

9696
# Delete prior codegen output
9797
# ---------------------------
@@ -113,7 +113,7 @@ def perform_codegen():
113113
# Load plotly schema
114114
# ------------------
115115
plot_schema_path = opath.join(
116-
packages_py, "plotly", "codegen", "resources", "plot-schema.json"
116+
project_root, "codegen", "resources", "plot-schema.json"
117117
)
118118

119119
with open(plot_schema_path, "r") as f:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)