From 323cc802b8cd8a5fc885a2c74796ae848b995979 Mon Sep 17 00:00:00 2001 From: Martha Cryan Date: Tue, 11 Feb 2025 14:55:12 -0600 Subject: [PATCH 1/2] Merge test and tests folder and clean up files --- .circleci/config.yml | 16 ++++++++-------- .gitignore | 4 ++-- .../python2.7/site-packages/plotly/version.py | 1 - {test => tests}/percy/compare-pandas.py | 0 {test => tests}/percy/plotly-express.py | 0 {test => tests}/percy/snapshots.yml | 0 6 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 test/vv/lib/python2.7/site-packages/plotly/version.py rename {test => tests}/percy/compare-pandas.py (100%) rename {test => tests}/percy/plotly-express.py (100%) rename {test => tests}/percy/snapshots.yml (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e82a4b66d6..6bbc74db2d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -276,24 +276,24 @@ jobs: name: Build html figures (Pandas 2) command: | . venv/bin/activate - python test/percy/plotly-express.py + python tests/percy/plotly-express.py - run: name: Build html figures (Pandas 1) and compare command: | . venv/bin/activate - mkdir test/percy/pandas2 - mv test/percy/*.html test/percy/pandas2/ + mkdir tests/percy/pandas2 + mv tests/percy/*.html tests/percy/pandas2/ # 1.1 is the earliest minor with Py3.9 wheels pip install "pandas==1.1.5" - python test/percy/plotly-express.py - python test/percy/compare-pandas.py - rm -rf test/percy/pandas2 + python tests/percy/plotly-express.py + python tests/percy/compare-pandas.py + rm -rf tests/percy/pandas2 - run: name: Run percy snapshots command: | npm i @percy/cli - npx percy snapshot -c test/percy/snapshots.yml test/percy/ - rm test/percy/*.html + npx percy snapshot -c tests/percy/snapshots.yml tests/percy/ + rm tests/percy/*.html plotlyjs_dev_build: docker: diff --git a/.gitignore b/.gitignore index a7536a9176a..0da5fe396a6 100644 --- a/.gitignore +++ b/.gitignore @@ -61,5 +61,5 @@ tags doc/check-or-enforce-order.py plotly/package_data/widgetbundle.js -test/percy/*.html -test/percy/pandas2/*.html +tests/percy/*.html +tests/percy/pandas2/*.html diff --git a/test/vv/lib/python2.7/site-packages/plotly/version.py b/test/vv/lib/python2.7/site-packages/plotly/version.py deleted file mode 100644 index f6bb6f4de32..00000000000 --- a/test/vv/lib/python2.7/site-packages/plotly/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "2.0.4" diff --git a/test/percy/compare-pandas.py b/tests/percy/compare-pandas.py similarity index 100% rename from test/percy/compare-pandas.py rename to tests/percy/compare-pandas.py diff --git a/test/percy/plotly-express.py b/tests/percy/plotly-express.py similarity index 100% rename from test/percy/plotly-express.py rename to tests/percy/plotly-express.py diff --git a/test/percy/snapshots.yml b/tests/percy/snapshots.yml similarity index 100% rename from test/percy/snapshots.yml rename to tests/percy/snapshots.yml From a95ed3ffb2b7f4f9326b1f1ff8f45a7e20364fa6 Mon Sep 17 00:00:00 2001 From: Martha Cryan Date: Tue, 11 Feb 2025 15:10:10 -0600 Subject: [PATCH 2/2] Fix broken filepath --- tests/percy/plotly-express.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/percy/plotly-express.py b/tests/percy/plotly-express.py index 428e30572e4..78283cd67e5 100644 --- a/tests/percy/plotly-express.py +++ b/tests/percy/plotly-express.py @@ -7,7 +7,7 @@ # tested with percy. # this directory -dir_name = os.path.join("test", "percy") +dir_name = os.path.join("tests", "percy") # #### Scatter and Line plots