Skip to content

Simplify the process of creating baselines using Kaleido and improve image & other export test systems #5724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 59 commits into from
Jun 25, 2021
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
0aced42
generate baselines by new system and using kaleido
archmoj Jun 10, 2021
f166d35
provide googleFonts for image test
archmoj Jun 11, 2021
96b3d5e
provide liberation2 fonts for image test
archmoj Jun 10, 2021
9fb28a3
provide noto font for japanese and gl3d_world-cals baselines
archmoj Jun 10, 2021
71cb928
Revise exports & baseline creation and testing using Kaleido
archmoj Jun 10, 2021
0f9292c
pin down versions in export test similar to image test
archmoj Jun 11, 2021
23ff879
add info on how to draft new baselines
archmoj Jun 14, 2021
ff9b12f
remove image viewer - one could use GitHub os vs-code
archmoj Jun 14, 2021
f23e4cb
move important info on making baselines and remove fat docker readme
archmoj Jun 14, 2021
e8f3d88
remove redundant start-test_dashboard
archmoj Jun 14, 2021
0dc8a41
Merge remote-tracking branch 'origin/master' into switch-to-kaleido
archmoj Jun 15, 2021
ca18710
Update test/image/make_baseline.py
archmoj Jun 15, 2021
fe0502c
Update test/image/make_baseline.py
archmoj Jun 15, 2021
02248d4
Update test/image/make_baseline.py
archmoj Jun 15, 2021
027323e
esp > eps
archmoj Jun 15, 2021
13322c5
test eps export on ci
archmoj Jun 15, 2021
7a44a8e
simplify exclude black lists
archmoj Jun 15, 2021
b1de0bb
reduce pixelmatch threshold to 0 for non-mapbox also fail on mapbox b…
archmoj Jun 17, 2021
4a28781
Merge remote-tracking branch 'origin/master' into switch-to-kaleido
archmoj Jun 18, 2021
82b0ead
update master new baselines using kaleido
archmoj Jun 18, 2021
f0c9e24
adjust bar_show_narrow test
archmoj Jun 18, 2021
4b1b383
Revert "adjust bar_show_narrow test"
archmoj Jun 21, 2021
74853f4
do not keep liberation2 fonts on the repo
archmoj Jun 23, 2021
6522bd5
install liberation2 fonts in docker
archmoj Jun 23, 2021
1786204
do not keep NotoSerifCJK fonts on the repo
archmoj Jun 23, 2021
9f705f7
install NotoSansCJK fonts in docker
archmoj Jun 23, 2021
083f9be
update japanese baseline
archmoj Jun 23, 2021
bb6abea
do not keep Raleway fonts on the repo
archmoj Jun 23, 2021
28077d1
add script to download some google fonts
archmoj Jun 23, 2021
856009e
update baselines using new Raleway fonts
archmoj Jun 23, 2021
f7f4cf1
do not keep Roboto fonts on the repo
archmoj Jun 23, 2021
21e262f
download Roboto fonts
archmoj Jun 23, 2021
9c71d22
update legend_horizontal_autowrap using new Roboto fonts
archmoj Jun 23, 2021
141e40d
do not keep PT_Sans-Narrow fonts on the repo
archmoj Jun 23, 2021
c1341fa
download PT_Sans-Narrow-Web
archmoj Jun 23, 2021
e791887
wip to download OpenSans fonts - could cause big diff
archmoj Jun 23, 2021
0c5d366
do not keep OldStandard fonts on the repo
archmoj Jun 23, 2021
d7548b1
download Old_Standar_dTT
archmoj Jun 24, 2021
09eb8fa
update baselines using new Old_Standard_TT fonts
archmoj Jun 24, 2021
2100fe9
Merge remote-tracking branch 'origin/master' into switch-to-kaleido
archmoj Jun 24, 2021
be8b865
generate baselines using new system
archmoj Jun 24, 2021
1a7461f
do not keep Droid_Sans fonts on the repo
archmoj Jun 24, 2021
1afa2fe
download NotoSans fonts instead of Driod_Sans
archmoj Jun 24, 2021
2a7071f
use NotoSans fonts instead of Driod_Sans
archmoj Jun 24, 2021
ab4b4f9
update baselines using NotoSans instead of Driod_Sans
archmoj Jun 24, 2021
8ad4a68
do not keep Droid_Serif fonts on the repo
archmoj Jun 24, 2021
3bfb395
download NotoSerif fonts instead of Driod_Serif
archmoj Jun 24, 2021
db307f6
use NotoSerif fonts instead of Driod_Serif
archmoj Jun 24, 2021
a4996d0
update baselines using NotoSerif instead of Driod_Serif
archmoj Jun 24, 2021
d1dcafb
do not keep Droid_Sans_Mono font on the repo
archmoj Jun 24, 2021
e98ce87
download NotoSansMono fonts instead of Driod_Sans_Mono
archmoj Jun 24, 2021
d65ee01
use NotoSansMono fonts instead of Driod_Sans_Mono
archmoj Jun 24, 2021
d99dd7f
update baselines using NotoSansMono instead of Driod_Sans_Mono
archmoj Jun 24, 2021
5996af1
do not keep Gravitas_One font on the repo
archmoj Jun 24, 2021
2b8d3ba
download GravitasOne
archmoj Jun 24, 2021
6a15c9e
do not keep Balto fonts on the repo
archmoj Jun 24, 2021
dd1dc35
use Roboto instead of Balto - Roboto used to be in legend_horizontal_…
archmoj Jun 24, 2021
b6a881e
update baselines using Roboto instead of Balto
archmoj Jun 24, 2021
5756afe
update CircleCi task description
archmoj Jun 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
93 changes: 71 additions & 22 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,41 +78,84 @@ jobs:
name: Run jasmine tests (part C)
command: ./.circleci/test.sh no-gl-flaky-jasmine

stable-image:
docker:
- image: plotly/testbed:latest
make-baselines:
parallelism: 4
working_directory: /var/www/streambed/image_server/plotly.js/
docker:
- image: circleci/python:3.8.9
working_directory: ~/plotly.js
steps:
- attach_workspace:
at: /var/www/streambed/image_server/
at: ~/
- run:
name: which pip3 version
command: which pip3 && pip3 --version
- run:
name: Run and setup container
name: install kaleido v0.2.1
command: python3 -m pip install kaleido==0.2.1
Comment on lines +93 to +94
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name: install kaleido v0.2.1
command: python3 -m pip install kaleido==0.2.1
name: install kaleido
command: pip install kaleido==0.2.1

again, in this env we should only have one pip to worry about... also let's not repeat the version number. (applies several places below too)

- run:
name: install plotly.io v4.14.3
command: python3 -m pip install plotly==4.14.3
- run:
name: install fonts
command: |
supervisord &
npm run docker -- setup
sudo cp -r .circleci/fonts/ /usr/share/
sudo fc-cache -f
- run:
name: create all png files
command: ./.circleci/test.sh make-baselines
- persist_to_workspace:
root: ~/
paths:
- plotly.js

test-baselines:
docker:
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- attach_workspace:
at: ~/
- run:
name: Run image tests (part A)
command: ./.circleci/test.sh stable-image || { tar -cvf build/baselines.tar build/test_images/ ; exit 1; } ; find build -maxdepth 1 -type f -delete
name: compare pixels
command: ./.circleci/test.sh test-image ; find build -maxdepth 1 -type f -delete
- store_artifacts:
path: build
destination: /

flaky-image:
make-exports:
docker:
- image: plotly/testbed:latest
working_directory: /var/www/streambed/image_server/plotly.js/
- image: circleci/python:3.8.9
working_directory: ~/plotly.js
steps:
- attach_workspace:
at: /var/www/streambed/image_server/
at: ~/
- run:
name: Run and setup container
command: |
supervisord &
npm run docker -- setup
name: which pip3 version
command: which pip3 && pip3 --version
- run:
name: install kaleido v0.2.1
command: python3 -m pip install kaleido==0.2.1
- run:
name: install plotly.io v4.14.3
command: python3 -m pip install plotly==4.14.3
- run:
name: Run image tests (part B)
command: ./.circleci/test.sh flaky-image ; find build -maxdepth 1 -type f -delete
name: create svg, jpg, jpeg, webp and pdf files
command: python3 test/image/make_exports.py
- persist_to_workspace:
root: ~/
paths:
- plotly.js

test-exports:
docker:
- image: circleci/node:12.22.1
working_directory: ~/plotly.js
steps:
- attach_workspace:
at: ~/
- run:
name: test export sizes
command: node test/image/export_test.js ; find build -maxdepth 1 -type f -delete
- store_artifacts:
path: build
destination: /
Expand Down Expand Up @@ -237,12 +280,18 @@ workflows:
- no-gl-flaky-jasmine:
requires:
- install-and-cibuild
- stable-image:
- make-baselines:
requires:
- install-and-cibuild
- flaky-image:
- test-baselines:
requires:
- make-baselines
- make-exports:
requires:
- install-and-cibuild
- test-exports:
requires:
- make-exports
- mock-validation:
requires:
- install-and-cibuild
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
202 changes: 202 additions & 0 deletions .circleci/fonts/truetype/googleFonts/Droid_Sans/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file not shown.
Loading