Merge pull request #5002 from plotly/simplify-dir-structure

Move `packages/python/plotly` to top level
plotly · Feb 4, 2025 · 5813a8a · 5813a8a
2 parents 9910078 + 9e15334
commit 5813a8a
Show file tree

Hide file tree

Showing 15,197 changed files with 655 additions and 689 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,15 +16,13 @@ commands:
       - run:
           name: Install dependencies
           command: |
-            cd packages/python/plotly
             python -m venv venv
             . venv/bin/activate
             pip install --upgrade pip wheel
             pip install -r ./test_requirements/requirements_<<parameters.py>>_core.txt
       - run:
           name: Test core
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest plotly/tests/test_core
           no_output_timeout: 20m
@@ -41,7 +39,6 @@ commands:
       - run:
           name: Install dependencies
           command: |
-            cd packages/python/plotly
             python -m venv venv
             . venv/bin/activate
             pip install --upgrade pip wheel
@@ -52,47 +49,40 @@ commands:
       - run:
           name: Install plotly-geo
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pip install plotly-geo
       - run:
           name: Test core
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest plotly/tests/test_core
           no_output_timeout: 20m
       - run:
           name: Test optional
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest plotly/tests/test_optional
           no_output_timeout: 40m
       - run:
           name: Test utils
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest _plotly_utils/tests/
           no_output_timeout: 20m
       - run:
           name: Test io
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest plotly/tests/test_io
           no_output_timeout: 20m
       - run:
           name: Test dependencdies not imported
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest -x test_init/test_dependencies_not_imported.py
       - run:
           name: Test lazy imports
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest -x test_init/test_lazy_imports.py
   test_orca:
@@ -107,15 +97,13 @@ commands:
       - run:
           name: Install dependencies
           command: |
-            cd packages/python/plotly
             python -m venv venv
             . venv/bin/activate
             pip install --upgrade pip wheel
             pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
       - run:
           name: Install plotly-geo
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pip install plotly-geo
       - run:
@@ -129,12 +117,11 @@ commands:
       - run:
           name: Test orca
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             pytest plotly/tests/test_orca
           no_output_timeout: 20m
       - store_artifacts:
-          path: packages/python/plotly/plotly/tests/test_orca/images/linux/failed
+          path: plotly/tests/test_orca/images/linux/failed
 
 jobs:
   check-code-formatting:
@@ -283,9 +270,9 @@ jobs:
             python -m venv venv
             . venv/bin/activate
             pip install --upgrade pip wheel
-            pip install -e ./packages/python/plotly
+            pip install -e .
             pip install plotly-geo
-            pip install -r ./packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt
+            pip install -r test_requirements/requirements_39_pandas_2_optional.txt
 
       - run:
           name: Build html figures (Pandas 2)
@@ -322,7 +309,6 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            cd packages/python/plotly
             python -m venv venv
             . venv/bin/activate
             pip install --upgrade pip wheel
@@ -331,27 +317,23 @@ jobs:
       - run:
           name: Update jupyter widget plotly.js version
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             python setup.py updateplotlywidgetversion
       - run:
           name: Update plotly.js to dev
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             python setup.py updateplotlyjsdev
       - run:
           name: Test core
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             locale
             pytest -k 'not nodev' plotly/tests/test_core
           no_output_timeout: 20m
       - run:
           name: Commit
           command: |
-            cd packages/python/plotly
             git config --global user.email "[email protected]"
             git config --global user.name "Your Name"
             git add -A
@@ -360,12 +342,11 @@ jobs:
       - run:
           name: Build source distribution packages
           command: |
-            cd packages/python/plotly
             . venv/bin/activate
             python setup.py sdist
           when: always
       - store_artifacts:
-          path: packages/python/plotly/dist
+          path: dist/
 
   full_build:
     docker:
@@ -392,7 +373,7 @@ jobs:
           command: |
             eval "$(conda shell.bash hook)"
             conda activate env
-            cd packages/python/plotly/js
+            cd js
             npm ci
             npm run build
             git status
@@ -402,27 +383,25 @@ jobs:
           command: |
             eval "$(conda shell.bash hook)"
             conda activate env
-            cd packages/python/plotly
             python setup.py sdist bdist_wheel
-            cp -R dist ../../../output/dist
+            cp -R dist output/dist
             git status
 
       - run:
           name: Conda Build
           command: |
             eval "$(conda shell.bash hook)"
             conda activate env
-            cd packages/python/plotly
             conda build recipe/
-            mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 ../../../output
+            mv /opt/conda/envs/env/conda-bld/noarch/plotly*.tar.bz2 output/
             git status
 
       - run:
           name: Build Widget javascript bundle
           command: |
             eval "$(conda shell.bash hook)"
             conda activate env
-            cd packages/python/plotly/js
+            cd js
             npm ci
             npm run build
 
@@ -471,12 +450,12 @@ jobs:
             pip install -r requirements.txt
             if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
               pip uninstall -y plotly
-              cd ../packages/python/plotly
+              cd ..
               pip install -e .
               cd js
               npm ci
               npm run build
-              cd ../../../../doc
+              cd ../doc
             fi
             cd ..
       - run:
@@ -553,9 +532,9 @@ jobs:
             # graph_objs/graph_objects
             if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
               pip uninstall -y plotly
-              cd ../packages/python/plotly
+              cd ..
               pip install -e .
-              cd ../../../doc
+              cd doc
               cd apidoc
               make html
               cd _build/html

diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-packages/python/plotly/plotly/_version.py export-subst
+plotly/_version.py export-subst
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 0
 0.html
 iframe_figures/
-packages/python/plotly/plotly/tests/test_orca/images/linux/failed/
+plotly/tests/test_orca/images/linux/failed/
 
 *.egg-info
 
@@ -15,6 +15,7 @@ doc/python/raw.githubusercontent.com/
 
 # Don't ignore dataset files
 !*.csv.gz
+!*.geojson.gz
 
 *.ipynb
 
@@ -59,10 +60,9 @@ doc/.ipynb_checkpoints
 tags
 doc/check-or-enforce-order.py
 
-packages/javascript/jupyterlab-plotly/lib/
-packages/python/plotly/jupyterlab_plotly/labextension/
-packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
-packages/python/plotly/plotly/package_data/widgetbundle.js
+jupyterlab_plotly/labextension/
+jupyterlab_plotly/nbextension/index.js*
+plotly/package_data/widgetbundle.js
 
 test/percy/*.html
 test/percy/pandas2/*.html
diff --git a/packages/python/plotly/MANIFEST.in → MANIFEST.in b/packages/python/plotly/MANIFEST.in → MANIFEST.in
diff --git a/README.md b/README.md
@@ -141,6 +141,8 @@ or conda
 conda install -c plotly plotly-geo=1.0.0
 ```
 
+`plotly-geo` can be found on Github at https://github.com/plotly/plotly-geo.
+
 ## Copyright and Licenses
 
 Code and documentation copyright 2019 Plotly, Inc.

diff --git a/...python/plotly/_plotly_future_/__init__.py → _plotly_future_/__init__.py b/...python/plotly/_plotly_future_/__init__.py → _plotly_future_/__init__.py
diff --git a/...y/_plotly_future_/extract_chart_studio.py → _plotly_future_/extract_chart_studio.py b/...y/_plotly_future_/extract_chart_studio.py → _plotly_future_/extract_chart_studio.py
diff --git a/...n/plotly/_plotly_future_/orca_defaults.py → _plotly_future_/orca_defaults.py b/...n/plotly/_plotly_future_/orca_defaults.py → _plotly_future_/orca_defaults.py
diff --git a/...ly/_plotly_future_/remove_deprecations.py → _plotly_future_/remove_deprecations.py b/...ly/_plotly_future_/remove_deprecations.py → _plotly_future_/remove_deprecations.py
diff --git a/...otly/_plotly_future_/renderer_defaults.py → _plotly_future_/renderer_defaults.py b/...otly/_plotly_future_/renderer_defaults.py → _plotly_future_/renderer_defaults.py
diff --git a/...otly/_plotly_future_/template_defaults.py → _plotly_future_/template_defaults.py b/...otly/_plotly_future_/template_defaults.py → _plotly_future_/template_defaults.py
diff --git a/...ython/plotly/_plotly_future_/timezones.py → _plotly_future_/timezones.py b/...ython/plotly/_plotly_future_/timezones.py → _plotly_future_/timezones.py
diff --git a/...thon/plotly/_plotly_future_/trace_uids.py → _plotly_future_/trace_uids.py b/...thon/plotly/_plotly_future_/trace_uids.py → _plotly_future_/trace_uids.py
diff --git a/packages/python/plotly/_plotly_future_/v4.py → _plotly_future_/v4.py b/packages/python/plotly/_plotly_future_/v4.py → _plotly_future_/v4.py
diff --git a/...hon/plotly/_plotly_future_/v4_subplots.py → _plotly_future_/v4_subplots.py b/...hon/plotly/_plotly_future_/v4_subplots.py → _plotly_future_/v4_subplots.py
diff --git a/...ges/python/plotly/_plotly_utils/README.md → _plotly_utils/README.md b/...ges/python/plotly/_plotly_utils/README.md → _plotly_utils/README.md
diff --git a/...s/python/plotly/_plotly_utils/__init__.py → _plotly_utils/__init__.py b/...s/python/plotly/_plotly_utils/__init__.py → _plotly_utils/__init__.py
diff --git a/...on/plotly/_plotly_utils/basevalidators.py → _plotly_utils/basevalidators.py b/...on/plotly/_plotly_utils/basevalidators.py → _plotly_utils/basevalidators.py
diff --git a/...n/plotly/_plotly_utils/colors/__init__.py → _plotly_utils/colors/__init__.py b/...n/plotly/_plotly_utils/colors/__init__.py → _plotly_utils/colors/__init__.py
diff --git a/.../plotly/_plotly_utils/colors/_swatches.py → _plotly_utils/colors/_swatches.py b/.../plotly/_plotly_utils/colors/_swatches.py → _plotly_utils/colors/_swatches.py
diff --git a/...thon/plotly/_plotly_utils/colors/carto.py → _plotly_utils/colors/carto.py b/...thon/plotly/_plotly_utils/colors/carto.py → _plotly_utils/colors/carto.py
diff --git a/...on/plotly/_plotly_utils/colors/cmocean.py → _plotly_utils/colors/cmocean.py b/...on/plotly/_plotly_utils/colors/cmocean.py → _plotly_utils/colors/cmocean.py
diff --git a/...lotly/_plotly_utils/colors/colorbrewer.py → _plotly_utils/colors/colorbrewer.py b/...lotly/_plotly_utils/colors/colorbrewer.py → _plotly_utils/colors/colorbrewer.py
diff --git a/...n/plotly/_plotly_utils/colors/cyclical.py → _plotly_utils/colors/cyclical.py b/...n/plotly/_plotly_utils/colors/cyclical.py → _plotly_utils/colors/cyclical.py
diff --git a/.../plotly/_plotly_utils/colors/diverging.py → _plotly_utils/colors/diverging.py b/.../plotly/_plotly_utils/colors/diverging.py → _plotly_utils/colors/diverging.py
diff --git a/...n/plotly/_plotly_utils/colors/plotlyjs.py → _plotly_utils/colors/plotlyjs.py b/...n/plotly/_plotly_utils/colors/plotlyjs.py → _plotly_utils/colors/plotlyjs.py
diff --git a/...lotly/_plotly_utils/colors/qualitative.py → _plotly_utils/colors/qualitative.py b/...lotly/_plotly_utils/colors/qualitative.py → _plotly_utils/colors/qualitative.py
diff --git a/...plotly/_plotly_utils/colors/sequential.py → _plotly_utils/colors/sequential.py b/...plotly/_plotly_utils/colors/sequential.py → _plotly_utils/colors/sequential.py
diff --git a/...python/plotly/_plotly_utils/data_utils.py → _plotly_utils/data_utils.py b/...python/plotly/_plotly_utils/data_utils.py → _plotly_utils/data_utils.py
diff --git a/...python/plotly/_plotly_utils/exceptions.py → _plotly_utils/exceptions.py b/...python/plotly/_plotly_utils/exceptions.py → _plotly_utils/exceptions.py
diff --git a/...ages/python/plotly/_plotly_utils/files.py → _plotly_utils/files.py b/...ages/python/plotly/_plotly_utils/files.py → _plotly_utils/files.py
diff --git a/.../python/plotly/_plotly_utils/importers.py → _plotly_utils/importers.py b/.../python/plotly/_plotly_utils/importers.py → _plotly_utils/importers.py
diff --git a/.../plotly/_plotly_utils/optional_imports.py → _plotly_utils/optional_imports.py b/.../plotly/_plotly_utils/optional_imports.py → _plotly_utils/optional_imports.py
diff --git a/packages/python/plotly/_plotly_utils/png.py → _plotly_utils/png.py b/packages/python/plotly/_plotly_utils/png.py → _plotly_utils/png.py
diff --git a/...on/plotly/_plotly_utils/tests/__init__.py → _plotly_utils/tests/__init__.py b/...on/plotly/_plotly_utils/tests/__init__.py → _plotly_utils/tests/__init__.py
diff --git a/...lotly_utils/tests/resources/1x1-black.png → _plotly_utils/tests/resources/1x1-black.png b/...lotly_utils/tests/resources/1x1-black.png → _plotly_utils/tests/resources/1x1-black.png
diff --git a/...plotly_utils/tests/validators/__init__.py → _plotly_utils/tests/validators/__init__.py b/...plotly_utils/tests/validators/__init__.py → _plotly_utils/tests/validators/__init__.py
diff --git a/.../tests/validators/test_angle_validator.py → .../tests/validators/test_angle_validator.py b/.../tests/validators/test_angle_validator.py → .../tests/validators/test_angle_validator.py
diff --git a/...ls/tests/validators/test_any_validator.py → ...ls/tests/validators/test_any_validator.py b/...ls/tests/validators/test_any_validator.py → ...ls/tests/validators/test_any_validator.py
diff --git a/...s/validators/test_basetraces_validator.py → ...s/validators/test_basetraces_validator.py b/...s/validators/test_basetraces_validator.py → ...s/validators/test_basetraces_validator.py
diff --git a/...ests/validators/test_boolean_validator.py → ...ests/validators/test_boolean_validator.py b/...ests/validators/test_boolean_validator.py → ...ests/validators/test_boolean_validator.py
diff --git a/.../tests/validators/test_color_validator.py → .../tests/validators/test_color_validator.py b/.../tests/validators/test_color_validator.py → .../tests/validators/test_color_validator.py
diff --git a/...ts/validators/test_colorlist_validator.py → ...ts/validators/test_colorlist_validator.py b/...ts/validators/test_colorlist_validator.py → ...ts/validators/test_colorlist_validator.py
diff --git a/...s/validators/test_colorscale_validator.py → ...s/validators/test_colorscale_validator.py b/...s/validators/test_colorscale_validator.py → ...s/validators/test_colorscale_validator.py
diff --git a/...sts/validators/test_compound_validator.py → ...sts/validators/test_compound_validator.py b/...sts/validators/test_compound_validator.py → ...sts/validators/test_compound_validator.py
diff --git a/...alidators/test_compoundarray_validator.py → ...alidators/test_compoundarray_validator.py b/...alidators/test_compoundarray_validator.py → ...alidators/test_compoundarray_validator.py
diff --git a/...s/tests/validators/test_dash_validator.py → ...s/tests/validators/test_dash_validator.py b/...s/tests/validators/test_dash_validator.py → ...s/tests/validators/test_dash_validator.py
diff --git a/...ts/validators/test_dataarray_validator.py → ...ts/validators/test_dataarray_validator.py b/...ts/validators/test_dataarray_validator.py → ...ts/validators/test_dataarray_validator.py
diff --git a/...s/validators/test_enumerated_validator.py → ...s/validators/test_enumerated_validator.py b/...s/validators/test_enumerated_validator.py → ...s/validators/test_enumerated_validator.py
diff --git a/...ils/tests/validators/test_fig_deepcopy.py → ...ils/tests/validators/test_fig_deepcopy.py b/...ils/tests/validators/test_fig_deepcopy.py → ...ils/tests/validators/test_fig_deepcopy.py
diff --git a/...sts/validators/test_flaglist_validator.py → ...sts/validators/test_flaglist_validator.py b/...sts/validators/test_flaglist_validator.py → ...sts/validators/test_flaglist_validator.py
diff --git a/...sts/validators/test_imageuri_validator.py → ...sts/validators/test_imageuri_validator.py b/...sts/validators/test_imageuri_validator.py → ...sts/validators/test_imageuri_validator.py
diff --git a/...ts/validators/test_infoarray_validator.py → ...ts/validators/test_infoarray_validator.py b/...ts/validators/test_infoarray_validator.py → ...ts/validators/test_infoarray_validator.py
diff --git a/...ests/validators/test_integer_validator.py → ...ests/validators/test_integer_validator.py b/...ests/validators/test_integer_validator.py → ...ests/validators/test_integer_validator.py
diff --git a/...ests/validators/test_literal_validator.py → ...ests/validators/test_literal_validator.py b/...ests/validators/test_literal_validator.py → ...ests/validators/test_literal_validator.py
diff --git a/...tests/validators/test_number_validator.py → ...tests/validators/test_number_validator.py b/...tests/validators/test_number_validator.py → ...tests/validators/test_number_validator.py
diff --git a/...ts/validators/test_pandas_series_input.py → ...ts/validators/test_pandas_series_input.py b/...ts/validators/test_pandas_series_input.py → ...ts/validators/test_pandas_series_input.py
diff --git a/...tests/validators/test_string_validator.py → ...tests/validators/test_string_validator.py b/...tests/validators/test_string_validator.py → ...tests/validators/test_string_validator.py
diff --git a/...ts/validators/test_subplotid_validator.py → ...ts/validators/test_subplotid_validator.py b/...ts/validators/test_subplotid_validator.py → ...ts/validators/test_subplotid_validator.py
diff --git a/...ests/validators/test_validators_common.py → ...ests/validators/test_validators_common.py b/...ests/validators/test_validators_common.py → ...ests/validators/test_validators_common.py
diff --git a/...ils/tests/validators/test_xarray_input.py → ...ils/tests/validators/test_xarray_input.py b/...ils/tests/validators/test_xarray_input.py → ...ils/tests/validators/test_xarray_input.py
diff --git a/...ages/python/plotly/_plotly_utils/utils.py → _plotly_utils/utils.py b/...ages/python/plotly/_plotly_utils/utils.py → _plotly_utils/utils.py
diff --git a/packages/python/plotly/codegen/__init__.py → codegen/__init__.py b/packages/python/plotly/codegen/__init__.py → codegen/__init__.py
@@ -90,8 +90,8 @@ def perform_codegen():
     # ---------------------------------
     # (relative to project root)
     abs_file_path = opath.realpath(__file__)
-    packages_py = opath.dirname(opath.dirname(opath.dirname(abs_file_path)))
-    outdir = opath.join(packages_py, "plotly", "plotly")
+    project_root = opath.dirname(opath.dirname(abs_file_path))
+    outdir = opath.join(project_root, "plotly")
 
     # Delete prior codegen output
     # ---------------------------
@@ -113,7 +113,7 @@ def perform_codegen():
     # Load plotly schema
     # ------------------
     plot_schema_path = opath.join(
-        packages_py, "plotly", "codegen", "resources", "plot-schema.json"
+        project_root, "codegen", "resources", "plot-schema.json"
     )
 
     with open(plot_schema_path, "r") as f:

diff --git a/...es/python/plotly/codegen/compatibility.py → codegen/compatibility.py b/...es/python/plotly/codegen/compatibility.py → codegen/compatibility.py
diff --git a/packages/python/plotly/codegen/datatypes.py → codegen/datatypes.py b/packages/python/plotly/codegen/datatypes.py → codegen/datatypes.py
diff --git a/packages/python/plotly/codegen/figure.py → codegen/figure.py b/packages/python/plotly/codegen/figure.py → codegen/figure.py
diff --git a/...plotly/codegen/resources/plot-schema.json → codegen/resources/plot-schema.json b/...plotly/codegen/resources/plot-schema.json → codegen/resources/plot-schema.json
diff --git a/packages/python/plotly/codegen/utils.py → codegen/utils.py b/packages/python/plotly/codegen/utils.py → codegen/utils.py
diff --git a/packages/python/plotly/codegen/validators.py → codegen/validators.py b/packages/python/plotly/codegen/validators.py → codegen/validators.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		packages/python/plotly/plotly/_version.py export-subst
		plotly/_version.py export-subst