Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 51d99bf

Browse files
QuLogicQuLogic
committed
Merge branch 'v3.3.x'
2 parents 17a0ff7 + e49322d commit 51d99bf

14 files changed

Lines changed: 1690 additions & 1315 deletions

File tree

‎doc/_static/zenodo_cache/3898017.svg‎

Lines changed: 35 additions & 0 deletions
Loading

‎doc/_static/zenodo_cache/3948793.svg‎

Lines changed: 35 additions & 0 deletions
Loading

‎doc/_static/zenodo_cache/3984190.svg‎

Lines changed: 35 additions & 0 deletions
Loading

‎doc/api/api_changes.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ added to Matplotlib, see :ref:`whats-new`
3838
next_api_changes/development/*
3939
next_api_changes/removals/*
4040

41+
.. include:: prev_api_changes/api_changes_3.3.1.rst
4142
.. include:: prev_api_changes/api_changes_3.3.0.rst

‎doc/api/prev_api_changes/api_changes_3.3.1.rst‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
API Changes for 3.3.1
2+
=====================
3+
4+
Deprecations
5+
------------
6+
7+
Reverted deprecation of ``num2epoch`` and ``epoch2num``
8+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9+
10+
These two functions were deprecated in 3.3.0, and did not return
11+
an accurate Matplotlib datenum relative to the new Matplotlib epoch
12+
handling (`~.dates.get_epoch` and :rc:`date.epoch`). This version
13+
reverts the deprecation.
14+
15+
Functions ``epoch2num`` and ``dates.julian2num`` use ``date.epoch`` rcParam
16+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17+
18+
Now `~.dates.epoch2num` and (undocumented) ``julian2num`` return floating point
19+
days since `~.dates.get_epoch` as set by :rc:`date.epoch`, instead of
20+
floating point days since the old epoch of "0000-12-31T00:00:00". If
21+
needed, you can translate from the new to old values as
22+
``old = new + mdates.date2num(np.datetime64('0000-12-31'))``

‎doc/citing.rst‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,15 @@ By version
3939
.. START OF AUTOGENERATED
4040
4141
42+
v3.3.1
43+
.. image:: _static/zenodo_cache/3984190.svg
44+
:target: https://doi.org/10.5281/zenodo.3984190
45+
v3.3.0
46+
.. image:: _static/zenodo_cache/3948793.svg
47+
:target: https://doi.org/10.5281/zenodo.3948793
4248
v3.2.2
43-
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3898017.svg
44-
:target: https://doi.org/10.5281/zenodo.3898017
49+
.. image:: _static/zenodo_cache/3898017.svg
50+
:target: https://doi.org/10.5281/zenodo.3898017
4551
v3.2.1
4652
.. image:: _static/zenodo_cache/3714460.svg
4753
:target: https://doi.org/10.5281/zenodo.3714460

‎doc/devel/MEP/MEP14.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ number of other projects:
8181
.. _pango: https://www.pango.org/
8282
.. _harfbuzz: https://www.freedesktop.org/wiki/Software/HarfBuzz/
8383
.. _QtTextLayout: https://doc.qt.io/archives/qt-4.8/qtextlayout.html
84-
.. _Microsoft DirectWrite: https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554(v=vs.85).aspx
84+
.. _Microsoft DirectWrite: https://docs.microsoft.com/en-ca/windows/win32/directwrite/introducing-directwrite
8585
.. _Apple Core Text: https://developer.apple.com/library/content/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html
8686

8787
Of the above options, it should be noted that harfbuzz_ is designed

‎doc/devel/gitwash/git_links.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
.. _github help: https://help.github.com
1515
.. _msysgit: https://git-scm.com/download/win
1616
.. _git-osx-installer: https://git-scm.com/download/mac
17-
.. _subversion: http://subversion.tigris.org/
17+
.. _subversion: https://subversion.apache.org/
1818
.. _git cheat sheet: https://help.github.com/git-cheat-sheets/
1919
.. _pro git book: https://git-scm.com/book/en/v2
2020
.. _git svn crash course: https://git-scm.com/course/svn.html

‎doc/resources/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
Applications
2727

2828
* `Ten Simple Rules for Better Figures
29-
<http://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
29+
<https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1003833>`_
3030
by Nicolas P. Rougier, Michael Droettboom and Philip E. Bourne
3131

3232
* `Learning Scientific Programming with Python chapter 7

‎doc/thirdpartypackages/index.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,9 @@ border, and logo.
284284

285285
figpager
286286
========
287-
`figpager <https://pypi.org/project/figpager/>`_ provides
288-
customizable figure elements such as text, lines and images
289-
and subplot layout control for single or multi page output.
287+
`figpager <https://pypi.org/project/figpager/>`_ provides customizable figure
288+
elements such as text, lines and images and subplot layout control for single
289+
or multi page output.
290290

291291
.. image:: /_static/figpager.png
292292

0 commit comments

Comments
 (0)