Skip to content

Change savefig.dpi and figure.dpi defaults#5659

Merged
efiring merged 1 commit intomatplotlib:masterfrom
jmehne:fix_305_2
Dec 13, 2015
Merged

Change savefig.dpi and figure.dpi defaults#5659
efiring merged 1 commit intomatplotlib:masterfrom
jmehne:fix_305_2

Conversation

@jmehne
Copy link
Copy Markdown
Contributor

@jmehne jmehne commented Dec 11, 2015

Change the default values for savefig.dpi and figure.dpi as suggested in #305.

savefig.dpi: 100 -> 'figure'
figure.dpi: 80 -> 100

@mdboom mdboom added this to the next major release (2.0) milestone Dec 11, 2015
@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented Dec 13, 2015

👍 from me

efiring added a commit that referenced this pull request Dec 13, 2015
@efiring
Merge pull request #5659 from three-comrades/fix_305_2
6333526 
Change `savefig.dpi` and `figure.dpi` defaults
@efiring efiring merged commit 6333526 into matplotlib:master Dec 13, 2015
@efiring
Copy link
Copy Markdown
Member

efiring commented Dec 13, 2015

Cherry-picked to v2.0.x as a903315. @tacaswell, did I do that correctly?

@mdboom
Copy link
Copy Markdown
Member

mdboom commented Dec 13, 2015

@efiring: We've been cherry-picking the merge commit (which in this case is 6333526) rather than the individual commits (in this case 016406a). I think you did the latter. It's not a huge difference, but it does keep a mention in the logs of which PR a feature came from for later reference if you do the former. It's also easier to merge a multi-commit PR that way.

@efiring
Copy link
Copy Markdown
Member

efiring commented Dec 13, 2015

@mdboom, OK, that makes sense, thank you. That requires using the "-m parent" option to the "git cherry-pick" command, doesn't it? How does one know the parent number?

@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented Dec 13, 2015

It is always parent 1 because we are meeting things into master

On Sun, Dec 13, 2015, 10:33 Eric Firing [email protected] wrote:

@mdboom https://github.com/mdboom, OK, that makes sense, thank you.
That requires using the "-m parent" option to the "git cherry-pick"
command, doesn't it? How does one know the parent number?

—
Reply to this email directly or view it on GitHub
#5659 (comment)
.

@efiring
Copy link
Copy Markdown
Member

efiring commented Dec 13, 2015

Travis is complaining about the original commit, but it seems unrelated to the actual file changes. Should I be worried?

ERROR: matplotlib.tests.test_axes.test_loglog.test

----------------------------------------------------------------------

Traceback (most recent call last):

  File "/home/travis/build/matplotlib/matplotlib/venv/lib/python3.5/site-packages/nose/case.py", line 198, in runTest

    self.test(*self.arg)

  File "/home/travis/build/matplotlib/matplotlib/venv/lib/python3.5/site-packages/matplotlib-1.5.0+127.ga903315-py3.5-linux-x86_64.egg/matplotlib/testing/decorators.py", line 54, in failer

    result = f(*args, **kwargs)

  File "/home/travis/build/matplotlib/matplotlib/venv/lib/python3.5/site-packages/matplotlib-1.5.0+127.ga903315-py3.5-linux-x86_64.egg/matplotlib/testing/decorators.py", line 235, in do_test

    self._tol, in_decorator=True)

  File "/home/travis/build/matplotlib/matplotlib/venv/lib/python3.5/site-packages/matplotlib-1.5.0+127.ga903315-py3.5-linux-x86_64.egg/matplotlib/testing/compare.py", line 306, in compare_images

    raise IOError('Baseline image %r does not exist.' % expected)

OSError: Baseline image '/home/travis/build/matplotlib/matplotlib/result_images/test_axes/loglog-expected.png' does not exist.

@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented Dec 13, 2015

Something seems to have gone wrong with that file, #5652 had the same issue.

@jmehne
Copy link
Copy Markdown
Contributor Author

jmehne commented Dec 13, 2015

Hm, strange. It seems like only AppVeyor was run.

@mdboom mdboom mentioned this pull request Dec 22, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@jmehne @tacaswell @efiring @mdboom