X Tutup
Skip to content

Fix captions for plot directive in latex target#6327

Merged
tacaswell merged 1 commit intomatplotlib:masterfrom
jarrodmillman:latex_figure_caption
Sep 28, 2016
Merged

Fix captions for plot directive in latex target#6327
tacaswell merged 1 commit intomatplotlib:masterfrom
jarrodmillman:latex_figure_caption

Conversation

@jarrodmillman
Copy link
Copy Markdown
Contributor

@jarrodmillman jarrodmillman commented Apr 23, 2016 •
edited
Loading

Builds on #4702

@tacaswell tacaswell added this to the 2.1 (next point release) milestone Apr 29, 2016
@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented Apr 29, 2016

@mdboom I think you are the only person around here how knows enough sphinx to review this.

@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented Apr 29, 2016

That said, this seems reasonable to me and I am willing to believe @jarrodmillman that this works.

@jarrodmillman jarrodmillman mentioned this pull request May 14, 2016
Merged
jarrodmillman added a commit to jarrodmillman/permute that referenced this pull request May 23, 2016
@jarrodmillman
ENH: update plot directive
28ca32e 
I submitted the changes upstream as well:
matplotlib/matplotlib#6327
@jarrodmillman jarrodmillman force-pushed the latex_figure_caption branch from eb59744 to a053ede Compare June 18, 2016 23:23
@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 17, 2016

Hi @jarrodmillman,
Thanks for the patch!
Do you mind rebasing? This branch is a bit old…
Cheers,
N

@NelleV NelleV self-assigned this Sep 17, 2016
@jarrodmillman
Copy link
Copy Markdown
Contributor Author

jarrodmillman commented Sep 18, 2016

@NelleV I've rebased. One test failed:
https://ci.appveyor.com/project/mdboom/matplotlib/build/1.0.2668/job/s5uiy60v9mdioyty

But according to the log, it was a problem cloning the repo:

Build started
ECHO %PYTHON_VERSION% PYTEST=%USE_PYTEST% %CONDA_INSTALL_LOCN%
2.7 PYTEST=no C:\Miniconda
git clone -q https://github.com/matplotlib/matplotlib.git C:\projects\matplotlib
fatal: early EOF
fatal: The remote end hung up unexpectedly
fatal: index-pack failed
error: RPC failed; curl 18 transfer closed with outstanding read data remaining
Command exited with code 128
python visual_tests.py
python: can't open file 'visual_tests.py': [Errno 2] No such file or directory
Command exited with code 2

It wasn't apparent to me how to get AppVeyor to try the build again.

@jarrodmillman
Copy link
Copy Markdown
Contributor Author

jarrodmillman commented Sep 21, 2016

I rebased again and now there is a different failure:
https://ci.appveyor.com/project/mdboom/matplotlib/build/1.0.2694/job/4xtfn67it73jrf6p

Here is the complaint:

======================================================================
FAIL: matplotlib.tests.test_backend_pgf.test_pdflatex
----------------------------------------------------------------------
Traceback (most recent call last):
  File "C:\Miniconda\envs\test-environment\lib\site-packages\nose\case.py", line 197, in runTest
    self.test(*self.arg)
  File "c:\projects\matplotlib\lib\matplotlib\testing\decorators.py", line 150, in wrapped_callable
    func(*args, **kwargs)
  File "c:\projects\matplotlib\lib\matplotlib\testing\decorators.py", line 476, in backend_switcher
    result = func(*args, **kwargs)
  File "c:\projects\matplotlib\lib\matplotlib\tests\test_backend_pgf.py", line 106, in test_pdflatex
    compare_figure('pgf_pdflatex.pdf', tol=0)
  File "c:\projects\matplotlib\lib\matplotlib\tests\test_backend_pgf.py", line 49, in compare_figure
    raise ImageComparisonFailure(err)
ImageComparisonFailure: Error: Image files did not match.
  RMS Value: 14.0418635074
  Expected:  
    C:\projects\matplotlib\result_images\test_backend_pgf\expected_pgf_pdflatex_pdf.png
  Actual:    
    C:\projects\matplotlib\result_images\test_backend_pgf\pgf_pdflatex_pdf.png
  Difference:
    C:\projects\matplotlib\result_images\test_backend_pgf\pgf_pdflatex_pdf-failed-diff.png
  Tolerance: 
    0
----------------------------------------------------------------------
Ran 6166 tests in 1671.759s
FAILED (KNOWNFAIL=37, SKIP=24, failures=1)

I took a look at pgf_pdflatex_pdf.png and expected_pgf_pdflatex_pdf.png. I doesn't appear the error was related to my modification of the Sphinx PDF template. However, I am not sure what happened.

I'll rebase again soon and see if the error persists.

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 21, 2016

Hi Jarrod,
The appveyor tests are very unreliable: I wouldn't worry too much about this.
Thanks for rebasing. I'll test on my computer tonight.

@NelleV
Copy link
Copy Markdown
Member

NelleV commented Sep 28, 2016

This looks good to me. 👍
@jarrodmillman by curiosity, do you use the plot directive in any projects?

@NelleV NelleV changed the title Fix captions for plot directive in latex target [MRG+1] Fix captions for plot directive in latex target Sep 28, 2016
@tacaswell tacaswell merged commit e4da584 into matplotlib:master Sep 28, 2016
@QuLogic QuLogic changed the title [MRG+1] Fix captions for plot directive in latex target Fix captions for plot directive in latex target Oct 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@mdboom mdboom

@NelleV NelleV

Labels

topic: sphinx extension

Projects

None yet

Milestone

v2.1

Development

Successfully merging this pull request may close these issues.

5 participants

@jarrodmillman @tacaswell @NelleV @mdboom @QuLogic
X Tutup