10000 Merge v3.2.x into master by QuLogic · Pull Request #16816 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Merge v3.2.x into master #16816

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.

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
merged 196 commits into from
Mar 18, 2020
Merged

Merge v3.2.x into master #16816

merged 196 commits into from
Mar 18, 2020

Conversation

QuLogic
Copy link
Member
@QuLogic QuLogic commented Mar 18, 2020

PR Summary

Suddenly a random extra test has started failing for me, so let's see how CI feels about this one. Just had some stray files lying around, I think.

Conflicts:

  • .circleci/config.yml
  • .github/workflows/circleci.yml
  • README.rst
  • azure-pipelines.yml
  • doc/api/prev_api_changes/api_changes_3.2.0/behavior.rst
  • doc/devel/documenting_mpl.rst
  • doc/index.rst
  • lib/matplotlib/init.py
  • lib/matplotlib/axis.py
  • lib/matplotlib/backends/backend_pgf.py
  • lib/matplotlib/category.py
  • lib/matplotlib/colors.py
  • lib/matplotlib/figure.py
  • lib/matplotlib/image.py
  • lib/matplotlib/mathtext.py
  • lib/matplotlib/rcsetup.py
  • lib/matplotlib/tests/test_mathtext.py
  • matplotlibrc.template
  • requirements/testing/travis_all.txt
  • tutorials/colors/colormapnorms.py

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • [n/a] New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • [n/a] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • [n/a] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

efiring and others added 30 commits January 13, 2020 20:57
…t-of-pr-16189-on-v3.2.x

Backport PR matplotlib#16189 on branch v3.2.x (MNT: set default canvas when un-pickling)
The PR missed the cut off for 3.1.
…t-of-pr-15763-on-v3.1.x

Backport PR matplotlib#15763 on branch v3.1.x (Skip webagg test if tornado is not available.)
…t-of-pr-15556-on-v3.1.x

Backport PR matplotlib#15556 on branch v3.1.x (Fix test suite compat with ghostscript 9.50.)
…t-of-pr-16212-on-v3.2.x

Backport PR matplotlib#16212 on branch v3.2.x (Fix deprecation from matplotlib#13544)
…t-of-pr-16223-on-v3.2.x

Backport PR matplotlib#16223 on branch v3.2.x (Added DNA Features Viewer description + screenshot in docs/thirdparty/)
…ation

DOC: ValidateInterval was deprecated in 3.2, not 3.1
…t-of-pr-16235-on-v3.1.x

Backport PR matplotlib#16235 on branch v3.1.x (FIX: AttributeError in TimerBase.start)
…t-of-pr-16235-on-v3.2.x

Backport PR matplotlib#16235 on branch v3.2.x (FIX: AttributeError in TimerBase.start)
…t-of-pr-16259-on-v3.2.x

Backport PR matplotlib#16259 on branch v3.2.x (TST: something changed in pytest 5.3.3 that breaks our qt fixtures)
…t-of-pr-16250-on-v3.2.x

Backport PR matplotlib#16250 on branch v3.2.x (Fix zerolen intersect)
…t-of-pr-16300-on-v3.2.x

Backport PR matplotlib#16300 on branch v3.2.x (Don't default to negative radii in polar plot.)
Merge pull request matplotlib#16250 from tacaswell/fix_zerolen_intersect

Fix zerolen intersect

Also re-factors some tests.

Conflicts:
	lib/matplotlib/tests/test_path.py
          - unrelated change to test above new test.  Kept old version
            of test and added new test
…t-of-pr-16311-on-v3.1.x

Backport PR matplotlib#16311 on branch v3.1.x (don't override non-Python signal handlers)
…t-of-pr-16311-on-v3.2.x

Backport PR matplotlib#16311 on branch v3.2.x (don't override non-Python signal handlers)
…-15462-on-v3.2.x

Backport PR matplotlib#15462 on v3.2.x: Simplify azure setup.
QuLogic and others added 19 commits March 17, 2020 00:20
…t-of-pr-16794-on-v3.2.0-doc

Backport PR matplotlib#16794 on branch v3.2.0-doc (DOC: Don't mention drawstyle in `set_linestyle` docs.)
API: Deprecate rcParams["datapath"] in favor of mpl.get_data_path().
…t-of-pr-16803-on-v3.2.0-doc

Backport PR matplotlib#16803 on branch v3.2.0-doc (Fix some doc issues)
…cumentation contributions easier to find, add to requirements for building docs
…t-of-pr-16779-on-v3.2.0-doc

Backport PR matplotlib#16779 on branch v3.2.0-doc (Documentation: make instructions for documentation contributions easier to find, add to requirements for building docs)
This is the first bugfix release of the 3.2.x series.

This release contains several critical bug-fixes:

 - fix `Quiver.set_UVC` calls with scalar inputs
 - fix `bezier.get_parallels` failure from floating point rounding
   errors
 - fix markers specified as tuples (polygons, stars, or asterisks)
 - fix saving PNGs to file objects in some places
 - fix saving figures using the nbAgg/notebook backend
 - fix saving with tight layout using the PGF backend
 - fix setting custom datapath in rcParams (note: it is still
   deprecated)
 - fix various issues running setup.py in non-CI environments
 - fix xpdf distiller
 - various minor bug and documentation fixes
So the tarballs from GitHub are stable.
@QuLogic QuLogic added this to the v3.3.0 milestone Mar 18, 2020
Not sure why it didn't fail to build on this branch.
@QuLogic
Copy link
Member Author
QuLogic commented Mar 18, 2020

This is failing because SymLogScale should have been SymmetricalLogScale, though I don't know why that didn't fail on v3.2.x branch. See #16817.

@QuLogic QuLogic marked this pull request as ready for review March 18, 2020 20:51
Copy link
Member
@tacaswell tacaswell left a comment

Choose a reason for hiding this comment

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

contingent on CI

(restarted the one failure that looked like file system issues)

@QuLogic QuLogic merged commit fe02c3b into matplotlib:master Mar 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0