Skip to content

Commit 5fd7b08

Browse files
committed
Merge from master
2 parents cad53a8 + cb162ad commit 5fd7b08

File tree

287 files changed

+3172
-31721
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+3172
-31721
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ dist
1313
docs/api
1414
docs/_build
1515

16+
# Subfolders in data directories
17+
**/cmaps/**
18+
**/cycles/**
19+
**/fonts/**
20+
1621
# Folder of notebooks for testing and bugfixing
1722
local
1823

.pre-commit-config.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@ repos:
33
- repo: https://github.com/pre-commit/pre-commit-hooks
44
rev: v2.2.3
55
hooks:
6+
- id: no-commit-to-branch
67
- id: double-quote-string-fixer
7-
- id: trailing-whitespace
8-
- id: end-of-file-fixer
98
- id: check-docstring-first
9+
- id: check-merge-conflict
1010
- id: check-yaml
1111
- id: debug-statements
12-
- id: check-merge-conflict
13-
- id: no-commit-to-branch
14-
15-
- repo: https://github.com/pre-commit/pre-commit-hooks
16-
rev: v2.2.3
17-
hooks:
12+
- id: end-of-file-fixer
13+
- id: trailing-whitespace
1814
- id: flake8
1915
args: ["--ignore=W503"]

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@ before_install:
2323
install:
2424
- conda env create -n proplot-dev --file docs/environment.yml
2525
- source activate proplot-dev
26-
- conda install pip
26+
- pip install flake8
2727
- conda list
2828
- which conda
2929
- which python
30-
- pip install .
31-
- python setup.py install --user
32-
- pip install flake8
3330

3431
script:
3532
- flake8 proplot --ignore=W503

CHANGELOG.rst

Lines changed: 115 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,127 @@
1+
..
2+
Valid subsections:
3+
- Deprecated
4+
- Features
5+
- Bug fixes
6+
- Internals
7+
- Documentation
8+
19
=================
210
Changelog history
311
=================
412

5-
ProPlot v1.0 (2020-##-##)
6-
=========================
13+
ProPlot v1.0.0 (2020-##-##)
14+
===========================
715
This will be published when some major refactoring tasks are completed.
816
See :pr:`45`, :pr:`46`, and :pr:`50`.
917

18+
ProPlot v0.2.4 (2019-12-07)
19+
===========================
20+
Deprecated
21+
----------
22+
- Rename `ColorCacheDict` to `~proplot.styletools.ColorDict` (:commit:`aee7d1be`).
23+
- Rename `colors` to `~proplot.styletools.Colors` (:commit:`aee7d1be`)
24+
- Remove `fonts_system` and `fonts_proplot`, rename `colordict` to
25+
`~proplot.styletools.colors`, make top-level variables
26+
more robust (:commit:`861583f8`).
27+
28+
Documentation
29+
-------------
30+
- Params table for `~proplot.styletools.show_fonts` (:commit:`861583f8`).
31+
32+
Internals
33+
---------
34+
- Improvements to `~proplot.styletools.register_colors`.
35+
36+
ProPlot v0.2.3 (2019-12-05)
37+
===========================
38+
Bug fixes
39+
---------
40+
- Fix issue with overlapping gridlines (:commit:`8960ebdc`).
41+
- Fix issue where auto colorbar labels are not applied when ``globe=True`` (:commit:`ecb3c899`).
42+
- More sensible zorder for gridlines (:commit:`90d94e55`).
43+
- Fix issue where customized super title settings are overridden when
44+
new axes are created (:commit:`35cb21f2`).
45+
46+
Documentation
47+
-------------
48+
- Organize ipython notebook documentation (:commit:`35cb21f2`).
49+
50+
Internals
51+
---------
52+
- Major cleanup of the `~proplot.wrappers.colorbar_wrapper` source code, handle
53+
minor ticks using the builtin matplotlib API just like major ticks (:commit:`b9976220`).
54+
55+
ProPlot v0.2.2 (2019-12-04)
56+
===========================
57+
Bug fixes
58+
---------
59+
- Fix shared *x* and *y* axis bugs (:commit:`ac14e9dd`).
60+
61+
Deprecated
62+
----------
63+
- Rename `~proplot.subplots.axes_grid` to `~proplot.subplots.subplot_grid` (:commit:`ac14e9dd`).
64+
65+
Documentation
66+
-------------
67+
- Make notebook examples PEP8 compliant (:commit:`97f5ffd4`). Much more readable now.
1068

11-
ProPlot v0.1 (2019-11-27)
12-
=========================
69+
ProPlot v0.2.1 (2019-12-02)
70+
===========================
71+
Deprecated
72+
----------
73+
- Rename `autoreload_setup`, `autosave_setup`, and `matplotlib_setup` to
74+
`~proplot.rctools.ipython_autoreload`, `~proplot.rctools.ipython_autosave`, and `~proplot.rctools.ipython_matplotlib`, respectively (:commit:`84e80c1e`).
1375

14-
The very first version! Published after merging
15-
:pr:`47` which added automatic Travis testing
16-
and significantly improved the documentation. `Luke Davis`_.
76+
ProPlot v0.2.0 (2019-12-02)
77+
===========================
78+
Features
79+
--------
80+
- Support manual resizing for all backends, including ``osx`` and ``qt`` (:commit:`3a622887`).
81+
82+
Bug fixes
83+
---------
84+
- Disable automatic resizing for the ``nbAgg`` interactive inline backend. Found no
85+
suitable workaround (:commit:`3a622887`).
86+
87+
Deprecated
88+
----------
89+
- Remove the ``nbsetup`` rc setting in favor of separate ``autosave``, ``autoreload``,
90+
and ``matplotlib`` settings for triggering the respective ``%`` magic commands.
91+
(:commit:`3a622887`; ``nbsetup`` is still accepted but no longer documented).
92+
- Rename the ``format`` rc setting in favor of the ``inlinefmt`` setting
93+
(:commit:`3a622887`; ``format`` is still accepted but no longer documented).
94+
- Rename ``FlexibleGridSpec`` and ``FlexibleSubplotSpec`` to ``GridSpec``
95+
and ``SubplotSpec`` (:commit:`3a622887`; until :pr:`50` is merged it is impossible
96+
to use these manually, so this won't bother anyone).
97+
98+
Internals
99+
---------
100+
- Organize the ``rc`` documentation and the default ``.proplotrc`` file (:commit:`3a622887`).
101+
- Rename ``rcParamsCustom`` to ``rcParamsLong``
102+
(:commit:`3a622887`; this is inaccessible to the user).
103+
- When calling ``fig.canvas.print_figure()`` on a stale figure, call ``fig.canvas.draw()``
104+
first. May be overkill for `~matplotlib.figure.Figure.savefig` but critical for
105+
correctly displaying already-drawn notebook figures.
106+
107+
ProPlot v0.1.0 (2019-12-01)
108+
===========================
109+
Internals
110+
---------
111+
- Include `flake8` in Travis CI testing (:commit:`8743b857`).
112+
- Enforce source code PEP8 compliance (:commit:`78da51a7`).
113+
- Use pre-commit for all future commits (:commit:`e14f6809`).
114+
- Implement tight layout stuff with canvas monkey patches (:commit:`67221d10`).
115+
ProPlot now works for arbitrary backends, not just inline and qt.
116+
117+
Documentation
118+
-------------
119+
- Various `RTD bugfixes <https://github.com/readthedocs/readthedocs.org/issues/6412>`__ (e.g. :commit:`37633a4c`).
120+
121+
ProPlot v0.0.0 (2019-11-27)
122+
===========================
123+
124+
The first version released on `PyPi <https://pypi.org/project/proplot/>`__.
17125

18126
.. _`Luke Davis`: https://github.com/lukelbd
19127
.. _`Riley X. Brady`: https://github.com/bradyrx
20-

INSTALL.rst

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
Installation
22
============
33

4-
To install ProPlot:
4+
To install or upgrade ProPlot:
55

66
.. code-block:: bash
77
8-
pip install proplot
8+
pip install -U proplot
99
10-
To upgrade to the latest version:
11-
12-
.. code-block:: bash
13-
14-
pip install --upgrade proplot
10+
If you previously used ``pip install git+https://github.com/lukelbd/proplot.git``
11+
to install a development version of proplot,
12+
please run ``pip uninstall`` first.
1513

1614
ProPlot's only hard dependency is `matplotlib <https://matplotlib.org/>`__. The *soft* dependencies are `cartopy <https://scitools.org.uk/cartopy/docs/latest/>`__, `basemap <https://matplotlib.org/basemap/index.html>`__, `xarray <http://xarray.pydata.org>`__, and `pandas <https://pandas.pydata.org>`__. See the documentation for details.
17-

README.rst

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
.. image:: https://github.com/lukelbd/proplot/blob/master/docs/_static/logo_long.png?raw=true
22
:width: 1000px
33

4-
|build-status| |coverage| |docs| |license| |gitter| |pr-welcome|
4+
|build-status| |docs| |pypi| |license| |gitter| |pr-welcome|
55

66
A comprehensive, easy-to-use `matplotlib <https://matplotlib.org/>`__ wrapper for making beautiful, publication-quality graphics.
77

8+
Documentation
9+
=============
10+
The documentation is `published on readthedocs <https://proplot.readthedocs.io>`__.
11+
812
Installation
913
============
1014

11-
To install ProPlot:
15+
To install or upgrade ProPlot:
1216

1317
.. code-block:: bash
1418
15-
pip install proplot
16-
17-
To upgrade to the latest version:
19+
pip install -U proplot
1820
19-
.. code-block:: bash
2021
21-
pip install --upgrade proplot
22+
If you previously used ``pip install git+https://github.com/lukelbd/proplot.git``
23+
to install a development version of proplot,
24+
please run ``pip uninstall`` first.
2225

2326
ProPlot's only hard dependency is `matplotlib <https://matplotlib.org/>`__. The *soft* dependencies are `cartopy <https://scitools.org.uk/cartopy/docs/latest/>`__, `basemap <https://matplotlib.org/basemap/index.html>`__, `xarray <http://xarray.pydata.org>`__, and `pandas <https://pandas.pydata.org>`__. See the documentation for details.
2427

25-
Documentation
26-
=============
27-
The documentation is `published on readthedocs <https://proplot.readthedocs.io>`__.
2828

29-
.. |build-status| image:: https://img.shields.io/travis/lukelbd/proplot.svg?style=flat
29+
.. |build-status| image:: https://travis-ci.com/lukelbd/proplot.svg?branch=master
3030
:alt: build status
3131
:target: https://travis-ci.org/lukelbd/proplot
3232

33-
.. |coverage| image:: https://codecov.io/gh/lukelbd/proplot.org/branch/master/graph/badge.svg
34-
:alt: coverage
35-
:target: https://codecov.io/gh/lukelbd/proplot.org
36-
3733
.. |license| image:: https://img.shields.io/github/license/lukelbd/proplot.svg
3834
:alt: license
3935
:target: LICENSE.txt
@@ -42,6 +38,10 @@ The documentation is `published on readthedocs <https://proplot.readthedocs.io>`
4238
:alt: docs
4339
:target: https://proplot.readthedocs.io/en/latest/?badge=latest
4440

41+
.. |pypi| image:: https://img.shields.io/pypi/v/proplot?color=83%20197%2052
42+
:alt: pypi
43+
:target: https://pypi.org/project/proplot/
44+
4545
.. |gitter| image:: https://badges.gitter.im/gitterHQ/gitter.svg
4646
:alt: gitter
4747
:target: https://gitter.im/pro-plot/community
@@ -50,6 +50,11 @@ The documentation is `published on readthedocs <https://proplot.readthedocs.io>`
5050
:alt: PR welcome
5151
:target: https://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project
5252

53+
..
54+
|coverage| image:: https://codecov.io/gh/lukelbd/proplot.org/branch/master/graph/badge.svg
55+
:alt: coverage
56+
:target: https://codecov.io/gh/lukelbd/proplot.org
57+
5358
..
5459
|quality| image:: https://api.codacy.com/project/badge/Grade/931d7467c69c40fbb1e97a11d092f9cd
5560
:alt: quality
@@ -60,11 +65,6 @@ The documentation is `published on readthedocs <https://proplot.readthedocs.io>`
6065
:alt: hits
6166
:target: http://hits.dwyl.io/lukelbd/lukelbd/proplot
6267
63-
..
64-
|pypi| image:: http://img.shields.io/pypi/v/proplot.svg?text=version
65-
:target: https://pypi.org/project/proplot/
66-
:alt: Latest release
67-
6868
..
6969
|contributions| image:: https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat
7070
:alt: contributions
@@ -74,13 +74,3 @@ The documentation is `published on readthedocs <https://proplot.readthedocs.io>`
7474
|issues| image:: https://img.shields.io/github/issues/lukelbd/proplot.svg
7575
:alt: issues
7676
:target: https://github.com/lukelbd/issues
77-
78-
..
79-
Sphinx is used following this guide (less traditional approach):
80-
https://daler.github.io/sphinxdoc-test/includeme.html
81-
82-
..
83-
Docstrings formatted according to:
84-
numpy guide: https://numpydoc.readthedocs.io/en/latest/format.html
85-
matplotlib guide: https://matplotlib.org/devel/documenting_mpl.html
86-

docs/.proplotrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# Tested SVG vs. PNG and speeds are comparable!
55
small: 9
66
large: 10
7-
format: svg
8-
nbsetup: True
7+
inlinefmt: svg
8+
matplotlib: 'auto'

0 commit comments

Comments
 (0)