Skip to content

Commit e394cfa

Browse files
cmp0xffcmp0xff
committed
Merge branch 'main' into feature/cmp0xff/28701-separate-generating-vertices
2 parents bc145e5 + cb9cf3b commit e394cfa

File tree

7 files changed

+841
-28
lines changed

7 files changed

+841
-28
lines changed

‎lib/matplotlib/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ def _get_version():
225225
else:
226226
return setuptools_scm.get_version(
227227
root=root,
228+
dist_name="matplotlib",
228229
version_scheme="release-branch-semver",
229230
local_scheme="node-and-date",
230231
fallback_version=_version.version,

‎lib/matplotlib/backends/qt_editor/figureoptions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def prepare_data(d, init):
165165
'Interpolation',
166166
[mappable.get_interpolation(), *interpolations]))
167167

168-
interpolation_stages = ['data', 'rgba']
168+
interpolation_stages = ['data', 'rgba', 'auto']
169169
mappabledata.append((
170170
'Interpolation stage',
171171
[mappable.get_interpolation_stage(), *interpolation_stages]))

‎lib/matplotlib/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ def get_interpolation_stage(self):
722722
"""
723723
Return when interpolation happens during the transform to RGBA.
724724
725-
One of 'data', 'rgba'.
725+
One of 'data', 'rgba', 'auto'.
726726
"""
727727
return self._interpolation_stage
728728

0 commit comments

Comments
 (0)