Skip to content

Fix plotting warnings in Pytest, add news for removal of six support #215

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.

Sign up for GitHub

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
sbillinge merged 2 commits into from
Oct 1, 2024
Merged

Fix plotting warnings in Pytest, add news for removal of six support #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e16ca33
Add news and fix warnings
bobleesj Sep 30, 2024
b976081
Add back original file content
bobleesj Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions news/six.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* six dependency in run.txt

**Fixed:**

* <news item>

**Security:**

* <news item>
23 changes: 23 additions & 0 deletions news/warning.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* <news item>

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* two warnings with (1) linestyle redundantly defined and (2) no artists with labels found to put in legend

**Security:**

* <news item>
7 changes: 4 additions & 3 deletions src/diffpy/pdfgui/gui/extendedplotframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,10 @@ def insertCurve(self, xData, yData, style):
style -- the way curve should be plotted
return: internal reference to the newly added curve
"""
stylestr, properties = self.__translateStyles(style)
curveRef = self.subplot.plot(xData, yData, stylestr, **properties)[0]
self.subplot.legend(**legendBoxProperties())
_, properties = self.__translateStyles(style)
curveRef = self.subplot.plot(xData, yData, **properties)[0]
Copy link
Contributor Author

@bobleesj bobleesj Sep 30, 2024

Choose a reason for hiding this comment

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

Warning 1: UserWarning: linestyle is redundantly defined by the 'linestyle' keyword argument

properties already has linestyle shown below:

           properties.update({"color": color, "linestyle": lineStyle, "linewidth": lineWidth})

if "legend" in style:
self.subplot.legend(**legendBoxProperties())
Copy link
Contributor Author

@bobleesj bobleesj Sep 30, 2024

Choose a reason for hiding this comment

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

Warning 2: No artists with labels found to put in legend. Note that artists whose label start with an underscore are ignored when legend() is called with no argument.

Solution - just check whether style contains legend like it was checked in line 321 of extendedplotframe.py

        if "legend" in style:
            properties["label"] = style["legend"]
        return stylestr, properties

try:
self.datalims[curveRef] = (min(xData), max(xData), min(yData), max(yData))
except ValueError:
Expand Down