Skip to content

Mrg2.0.x #8110

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 38 commits into from
Feb 20, 2017
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f6b4a32
FIX: Restore hatch color tracking edge color
tacaswell Jan 28, 2017
a58b0d1
DOC: add whats_new and api_changes entries for gc hatch methods
tacaswell Jan 29, 2017
c2daee2
Fix another datad[cmapname] that didn't exist in master.
QuLogic Jan 30, 2017
a8a769d
Fix grammar of Vega cmap deprecation message.
QuLogic Jan 30, 2017
fbe562c
Merge pull request #7986 from QuLogic/fix-cmap-deprecation
NelleV Jan 30, 2017
98a9347
Merge pull request #7809 from lkilcher/marker_verts_bug
dstansby Jan 30, 2017
8481bc5
Merge pull request #7997 from anntzer/image-tutorial-cmap
dstansby Jan 31, 2017
ab81f13
Test 2.0.x on released python 3.6
dstansby Jan 31, 2017
936315c
Fix broken backported test
dstansby Jan 31, 2017
6b2e116
PEP8
dstansby Jan 31, 2017
c4700bb
FIX: do not try to render empty images
tacaswell Feb 1, 2017
6727dc6
Merge pull request #8004 from dstansby/backport-test-fix
NelleV Feb 1, 2017
654b53b
Merge pull request #8000 from matplotlib/testing-3.6-1
QuLogic Feb 1, 2017
d9742a4
DOC: add missing docs for change to Figure.set_size_inches
tacaswell Feb 2, 2017
493cb8a
Merge pull request #8008 from tacaswell/doc_document_set_size_inches_…
NelleV Feb 2, 2017
48d0ddc
TST: fix test (turns out it is not a context manager)
tacaswell Feb 5, 2017
3ae2ec9
FIX: numpy arrays are not 'truthy'
tacaswell Feb 5, 2017
99de4a7
Bump font cache version.
QuLogic Feb 6, 2017
9c031b9
Merge pull request #8025 from tacaswell/fix_log_subs
NelleV Feb 6, 2017
af37a47
Merge pull request #8029 from QuLogic/fontcache-bump
NelleV Feb 6, 2017
acda4ac
DOC: add missing word
tacaswell Feb 6, 2017
babdf73
MNT: minor tweak to checking size
tacaswell Feb 6, 2017
d63c95d
Merge pull request #7976 from tacaswell/fix_hatch_color
QuLogic Feb 6, 2017
013fd3f
Merge pull request #8006 from tacaswell/fix_imshow_segfault
QuLogic Feb 6, 2017
c43f4fd
FIX: in errorbar discard any kwargs which have None value
tacaswell Feb 6, 2017
e5c3cba
Merge pull request #8033 from shaunwbell/patch-1
tacaswell Feb 7, 2017
9b8b99b
Fixed a small mistake in matplotlibrc.template
rebot Feb 7, 2017
dfd1da5
Merge pull request #8037 from tacaswell/fix_errorbar_color_cycle
dopplershift Feb 8, 2017
f7865d3
Merge pull request #8042 from rebot/patch-1
tacaswell Feb 9, 2017
ac51372
Merge pull request #8070 from heath730/setup_cfg_update
phobson Feb 13, 2017
a347da9
Merge pull request #8084 from jacob-on-github/patch-2
dstansby Feb 16, 2017
1cce7d3
Merge pull request #8086 from mitya57/master
tacaswell Feb 17, 2017
276e1e9
API: Remove lw clipping for dash scaling and tweak pattern
tacaswell Feb 6, 2017
c5a59e3
TST: Tests which require updates due to previous commit
tacaswell Feb 6, 2017
2558530
Merge pull request #8032 from tacaswell/api_lw_scale_clipping
afvincent Feb 17, 2017
35996ce
Merge pull request #8094 from patniharshit/keepmiddle
dstansby Feb 18, 2017
752d6c6
Merge remote-tracking branch 'matplotlib/v2.0.0-doc' into v2.0.x
tacaswell Feb 20, 2017
47fdc32
Merge remote-tracking branch 'matplotlib/v2.0.x'
tacaswell Feb 20, 2017
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
Prev Previous commit
Next Next commit
DOC: add missing word
  • Loading branch information
tacaswell committed Feb 6, 2017
commit acda4ac802e6d0d1308db2f7d68df813fea66dbc
2 changes: 1 addition & 1 deletion doc/users/dflt_style_changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ Hatching

The color of the lines in the hatch is now determined by

- If an edge color is explicitly, use that for the hatch color
- If an edge color is explicitly set, use that for the hatch color
- If the edge color is not explicitly set, use ``rcParam['hatch.color']`` which
is looked up at artist creation time.

Expand Down