Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 634640f

Browse filesBrowse files
QuLogicQuLogic
committed
Merge branch 'v2.2.x'
2 parents 506520f + aa87ae3 commit 634640f
Copy full SHA for 634640f

File tree

Expand file treeCollapse file tree

6 files changed

+138
-21
lines changed
Filter options
Expand file treeCollapse file tree

6 files changed

+138
-21
lines changed

‎doc/_static/mpl.css

Copy file name to clipboardExpand all lines: doc/_static/mpl.css
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,26 @@ figcaption {
768768
text-align: center;
769769
}
770770

771+
772+
/* "Summer Fellowship" message. */
773+
#summer-fellowship {
774+
background: #11557C;
775+
box-sizing: border-box;
776+
color: #fffa;
777+
font-weight: bold;
778+
left: 0;
779+
min-height: 3em;
780+
padding: 0.5em;
781+
top: 0;
782+
width: 100%;
783+
z-index: 10000;
784+
}
785+
786+
#summer-fellowship a {
787+
color: #fff;
788+
text-decoration:underline;
789+
}
790+
771791
/* "Go to released version" message. */
772792
#unreleased-message {
773793
background: #d62728;

‎doc/_templates/layout.html

Copy file name to clipboardExpand all lines: doc/_templates/layout.html
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,12 @@ <h3>{{ _('Navigation') }}</h3>
172172
</a>
173173
</div>
174174
{%- endif %}
175+
<div id="summer-fellowship">
176+
Applications are open for the 2018 John Hunter Matplotlib Summer Fellowship.
177+
<a href="https://www.numfocus.org/programs/john-hunter-technology-fellowship">
178+
Apply now!
179+
</a>
180+
</div>
175181
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
176182
{%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
177183
<a href="{{ pathto('index') }}">

‎doc/citing.rst

Copy file name to clipboardExpand all lines: doc/citing.rst
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
2727
2828
DOIs
2929
----
30+
v2.2.2
31+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202077.svg
32+
:target: https://doi.org/10.5281/zenodo.1202077
33+
v2.2.1
34+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1202050.svg
35+
:target: https://doi.org/10.5281/zenodo.1202050
3036
v2.2.0
3137
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1189358.svg
3238
:target: https://doi.org/10.5281/zenodo.1189358

‎doc/devel/coding_guide.rst

Copy file name to clipboardExpand all lines: doc/devel/coding_guide.rst
+63-21Lines changed: 63 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ Pull request checklist
1212
Branch selection
1313
----------------
1414

15-
* In general, simple bugfixes that are unlikely to introduce new bugs
16-
of their own should be merged onto the maintenance branch. New
17-
features, or anything that changes the API, should be made against
18-
master. The rules are fuzzy here -- when in doubt, target master.
15+
In general target the master branch for all new features and
16+
bug-fixes. PRs may target maintenance or doc branches on
17+
a case-by-case basis.
1918

20-
* Once changes are merged into the maintenance branch, they should
21-
be merged into master.
2219

2320
Documentation
2421
-------------
@@ -87,31 +84,76 @@ PR Review guidelines
8784
merge the PR and then open a new PR against upstream.
8885

8986

90-
Backports
91-
=========
87+
Branches and Backports
88+
======================
9289

9390

94-
When doing backports please include the branch you backported the
95-
commit to along with the SHA in a comment on the original PR.
91+
The current active branches are
9692

97-
We do a backport from master to v2.0.x assuming:
93+
*master*
94+
This will be Matplotlib 3.0. Supports Python 3.5+.
9895

99-
* ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
96+
*v2.2.x*
97+
Maintenance branch for Matplotlib 2.2 LTS. Supports Python 2.7, 3.4+
98+
99+
*v2.2.N-doc*
100+
Documentation for the current release. On a patch release, this will be replaced
101+
by a properly named branch for the new release.
102+
103+
104+
We always will backport to 2.2.x
105+
106+
- critical bug fixes (segfault, failure to import, things that the
107+
user can not work around)
108+
- fixes for regressions against 2.0 or 2.1
109+
110+
Everything else (regressions against 1.x versions, bugs/api
111+
inconsistencies the user can work around in their code) are on a
112+
case-by-case basis, should be low-risk, and need someone to advocate
113+
for and shepherd through the backport.
114+
115+
The only changes to be backported to 2.2.N-doc are changes to
116+
``doc``, ``examples``, or ``tutorials``. Any changes to
117+
``lib`` or ``src`` should not be backported to this branch.
118+
119+
Automated backports
120+
-------------------
100121

101-
* ``DANGER`` is a read/write remote branch of the matplotlib/matplotlib repo
122+
We use meeseeksdev bot to automatically backport merges to the correct
123+
maintenance branch base on the milestone. To work properly the
124+
milestone must be set before merging. If you have commit rights, the
125+
bot can also be manually triggered after a merge by leaving a message
126+
``@meeseeksdev backport to BRANCH`` on the PR. If there are conflicts
127+
meeseekdevs will inform you that the backport needs to be done
128+
manually.
129+
130+
The target branch is configured by putting ``on-merge: backport to
131+
TARGETBRANCH`` in the milestone description on it's own line.
132+
133+
If the bot is not working as expected, please report issues to
134+
`Meeseeksdev <https://github.com/MeeseeksBox/MeeseeksDev>`__.
135+
136+
137+
Manual backports
138+
----------------
139+
140+
When doing backports please copy the form used by meeseekdev,
141+
``Backport PR #XXXX: TITLE OF PR``. If you need to manually resolve
142+
conflicts make note of them and how you resolved them in the commit
143+
message.
144+
145+
We do a backport from master to v2.2.x assuming:
146+
147+
* ``matplotlib`` is a read-only remote branch of the matplotlib/matplotlib repo
102148

103149
The ``TARGET_SHA`` is the hash of the merge commit you would like to
104150
backport. This can be read off of the github PR page (in the UI with
105151
the merge notification) or through the git CLI tools.::
106152

107153
git fetch matplotlib
108-
git checkout v2.0.x
109-
git merge --ff-only matplotlib/v2.0.x
154+
git checkout v2.2.x
155+
git merge --ff-only matplotlib/v2.2.x
110156
git cherry-pick -m 1 TARGET_SHA
111-
git log --graph --decorate # to look at it
112-
# local tests? (use your judgment)
113-
git push DANGER v2.0.x
114-
# leave a comment on PR noting sha of the resulting commit
115-
# from the cherry-pick + branch it was moved to
157+
# resolve conflicts and commit if required
116158

117-
These commands work on git 2.7.1.
159+
Use your discretion to push directly to upstream or to open a PR.

‎doc/devel/index.rst

Copy file name to clipboardExpand all lines: doc/devel/index.rst
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ The Matplotlib Developers' Guide
2020
gitwash/index.rst
2121
coding_guide.rst
2222
release_guide.rst
23+
min_dep_policy.rst
2324
MEP/index
2425

2526
.. toctree::

‎doc/devel/min_dep_policy.rst

Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
.. _min_deps_policy:
2+
3+
======================================
4+
Minimum Version of Dependencies Policy
5+
======================================
6+
7+
Python and numpy
8+
================
9+
10+
- support minor versions of ``Python`` initially released in the previous
11+
3 years
12+
- support minor versions of ``numpy`` initially released in the
13+
previous 3 years or oldest that supports the minimum python version
14+
(which ever is higher)
15+
16+
We will bump the minimum python and numpy versions as we can every
17+
minor and major release, but never on a patch release.
18+
19+
Python Dependencies
20+
===================
21+
22+
For python dependencies we should support at least
23+
24+
with compiled extensions
25+
minor versions released in the last 3 years
26+
or the oldest that support our minimum python + numpy
27+
28+
without complied extensions
29+
minor versions released in the last 2 years or the oldest that
30+
supports our minimum python.
31+
32+
We will only bump these dependencies as we need new features or the
33+
old versions no longer support our minimum numpy or python.
34+
35+
36+
System and C-dependencies
37+
=========================
38+
39+
For system or c-dependencies (libpng, freetype, GUI frameworks, latex,
40+
gs, ffmpeg) support as old as practical. These can be difficult to
41+
install for end-users and we want to be usable on as many systems as
42+
possible. We will bump these on a case-by-case basis.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.