8000 Added machinery for creating separate matplotlib-baseline-images package · matplotlib/matplotlib@6238066 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6238066

Browse files
SidharthBansalSidharthBansal
committed
Added machinery for creating separate matplotlib-baseline-images package
1 parent a339b8c commit 6238066

File tree

10 files changed

+128
-26
lines changed

10 files changed

+128
-26
lines changed

‎MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ recursive-include tutorials *
2121
include versioneer.py
2222
include lib/matplotlib/_version.py
2323
include tests.py
24+
prune sub-wheels

‎lib/matplotlib/testing/decorators.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import sys
1010
import unittest
1111
import warnings
12+
import matplotlib_baseline_images
1213
try:
1314
from contextlib import nullcontext
1415
except ImportError:
@@ -481,8 +482,8 @@ def _image_directories(func):
481482
``$(pwd)/result_images/test_baz``. The result directory is created if it
482483
doesn't exist.
483484
"""
484-
module_path = Path(sys.modules[func.__module__].__file__)
485-
baseline_dir = module_path.parent / "baseline_images" / module_path.stem
485+
module_path = Path(sys.modules[func.__module__].__file_)
486+
baseline_dir = matplotlib_baseline_images.__file__ / "mpl_baseline_images" / module_path.stem
486487
result_dir = Path().resolve() / "result_images" / module_path.stem
487488
result_dir.mkdir(parents=True, exist_ok=True)
488489
return baseline_dir, result_dir

‎setup.cfg.template

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111

1212
[packages]
1313
# There are a number of data subpackages from Matplotlib that are
14-
# considered optional. All except 'tests' data (meaning the baseline
15-
# image files) are installed by default, but that can be changed here.
16-
#tests = False
14+
# considered optional. Sample data are installed by default, but that can be
15+
# changed here.
1716
#sample_data = True
1817

1918
[gui_support]

‎setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
setupext.Platform(),
6363
setupext.FreeType(),
6464
setupext.SampleData(),
65-
setupext.Tests(),
6665
setupext.BackendMacOSX(),
6766
]
6867

‎setupext.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -439,24 +439,6 @@ def get_package_data(self):
439439
}
440440

441441

442-
class Tests(OptionalPackage):
443-
name = "tests"
444-
default_config = False
445-
446-
def get_package_data(self):
447-
return {
448-
'matplotlib': [
449-
*_pkg_data_helper('matplotlib', 'tests/baseline_images'),
450-
*_pkg_data_helper('matplotlib', 'tests/tinypages'),
451-
'tests/cmr10.pfb',
452-
'tests/mpltest.ttf',
453-
],
454-
'mpl_toolkits': [
455-
*_pkg_data_helper('mpl_toolkits', 'tests/baseline_images'),
456-
]
457-
}
458-
459-
460442
def add_numpy_flags(ext):
461443
import numpy as np
462444
ext.include_dirs.append(np.get_include())

‎sub-wheels/matplotlib-baseline-images/LICENSE

Lines changed: 99 additions & 0 deletions
F438
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
License agreement for matplotlib versions 1.3.0 and later
2+
=========================================================
3+
4+
1. This LICENSE AGREEMENT is between the Matplotlib Development Team
5+
("MDT"), and the Individual or Organization ("Licensee") accessing and
6+
otherwise using matplotlib software in source or binary form and its
7+
associated documentation.
8+
9+
2. Subject to the terms and conditions of this License Agreement, MDT
10+
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
11+
to reproduce, analyze, test, perform and/or display publicly, prepare
12+
derivative works, distribute, and otherwise use matplotlib
13+
alone or in any derivative version, provided, however, that MDT's
14+
License Agreement and MDT's notice of copyright, i.e., "Copyright (c)
15+
2012- Matplotlib Development Team; All Rights Reserved" are retained in
16+
matplotlib alone or in any derivative version prepared by
17+
Licensee.
18+
19+
3. In the event Licensee prepares a derivative work that is based on or
20+
incorporates matplotlib or any part thereof, and wants to
21+
make the derivative work available to others as provided herein, then
22+
Licensee hereby agrees to include in any such work a brief summary of
23+
the changes made to matplotlib .
24+
25+
4. MDT is making matplotlib available to Licensee on an "AS
26+
IS" basis. MDT MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
27+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, MDT MAKES NO AND
28+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB
30+
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
31+
32+
5. MDT SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
33+
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
34+
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35+
MATPLOTLIB , OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
36+
THE POSSIBILITY THEREOF.
37+
38+
6. This License Agreement will automatically terminate upon a material
39+
breach of its terms and conditions.
40+
41+
7. Nothing in this License Agreement shall be deemed to create any
42+
relationship of agency, partnership, or joint venture between MDT and
43+
Licensee. This License Agreement does not grant permission to use MDT
44+
trademarks or trade name in a trademark sense to endorse or promote
45+
products or services of Licensee, or any third party.
46+
47+
8. By copying, installing or otherwise using matplotlib ,
48+
Licensee agrees to be bound by the terms and conditions of this License
49+
Agreement.
50+
51+
License agreement for matplotlib versions prior to 1.3.0
52+
========================================================
53+
54+
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
55+
Individual or Organization ("Licensee") accessing and otherwise using
56+
matplotlib software in source or binary form and its associated
57+
documentation.
58+
59+
2. Subject to the terms and conditions of this License Agreement, JDH
60+
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
61+
to reproduce, analyze, test, perform and/or display publicly, prepare
62+
derivative works, distribute, and otherwise use matplotlib
63+
alone or in any derivative version, provided, however, that JDH's
64+
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
65+
2002-2011 John D. Hunter; All Rights Reserved" are retained in
66+
matplotlib alone or in any derivative version prepared by
67+
Licensee.
68+
69+
3. In the event Licensee prepares a derivative work that is based on or
70+
incorporates matplotlib or any part thereof, and wants to
71+
make the derivative work available to others as provided herein, then
72+
Licensee hereby agrees to include in any such work a brief summary of
73+
the changes made to matplotlib.
74+
75+
4. JDH is making matplotlib available to Licensee on an "AS
76+
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
77+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
78+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
79+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB
80+
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
81+
82+
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
83+
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
84+
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
85+
MATPLOTLIB , OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
86+
THE POSSIBILITY THEREOF.
87+
88+
6. This License Agreement will automatically terminate upon a material
89+
breach of its terms and conditions.
90+
91+
7. Nothing in this License Agreement shall be deemed to create any
92+
relationship of agency, partnership, or joint venture between JDH and
93+
Licensee. This License Agreement does not grant permission to use JDH
94+
trademarks or trade name in a trademark sense to endorse or promote
95+
products or services of Licensee, or any third party.
96+
97+
8. By copying, installing or otherwise using matplotlib,
98+
Licensee agrees to be bound by the terms and conditions of this License
99+
Agreement.

‎sub-wheels/matplotlib-baseline-images/README.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Matplotlib-baseline-images is a data package containing matplotlib baseline images and matplotlib toolkit baseline images.
2+
Baseline images were earlier installed with the matplotlib. Now they are separately installed with the main matplotlib package.

‎sub-wheels/matplotlib-baseline-images/baseline_images/__init__.py

Whitespace-only changes.

‎sub-wheels/matplotlib-baseline-images/setup.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
from setuptools import setup, find_packages
2+
import os
3+
from pathlib import Path
4+
import sys
5+
import subprocess
6+
7+
__version__ = subprocess.check_output(
8+
[sys.executable, "setup.py","--version"], cwd="../..",
9+
universal_newlines=True).rstrip("\n")
10+
11+
setup(
12+
name="matplotlib.baseline-images",
13+
version=__version__,
14+
description="Package containing Matplotlib baseline images and Matplotlib toolkit images",
15+
url="https://github.com/matplotlib/sub-wheels/matplotlib-baseline-images/baseline-images",
16+
packages=find_packages(),
17+
include_package_data=True,
18+
install_requires=["matplotlib=={}".format(__version__)]
19+
)

‎tools/triage_tests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
# these two places.
3939

4040
BASELINE_IMAGES = [
41-
Path('lib/matplotlib/tests/baseline_images'),
42-
Path('lib/mpl_toolkits/tests/baseline_images'),
41+
Path('sub-wheels/matplotlib-baseline-images/mpl_baseline_images'),
42+
Path('sub-wheels/matplotlib-baseline-images/mpl_toolkits_baseline_images'),
4343
]
4444

4545

0 commit comments

Comments
 (0)
0