Skip to content

Commit 35df66d

Browse files
authored
Merge branch 'master' into master
2 parents 25c050d + 7a8e965 commit 35df66d

Some content is hidden

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

64 files changed

+911
-2963
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dist
1616
# Local docs builds
1717
docs/api
1818
docs/_build
19+
docs/_static/pygments
1920

2021
# Subfolder used to consider new colormaps
2122
sources

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ before_install:
2828
- conda info -a
2929

3030
install:
31-
- conda env create -n proplot-dev --file ci/environment.yml
31+
- conda env create --name proplot-dev --file ci/environment.yml
3232
- source activate proplot-dev
3333
- conda list
3434
- which conda

CHANGELOG.rst

Lines changed: 375 additions & 275 deletions
Large diffs are not rendered by default.

ci/environment.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# Hard requirements for running tests
2-
# NOTE: Basemap is broken as of matplotlib >=3.3 so for documentation
2+
# NOTE: Keep up-to-date with docs/environment.yml!
3+
# NOTE: Basemap is broken as of matplotlib >= 3.3 so for documentation
34
# use 3.2.1. Probably lots of basemap holdouts for next ~5 years.
45
# NOTE: PyQt5 is needed by pyplot, RTD server *happens* to already have it
56
# but creating local environment will fail.
7+
# NOTE: Jinja >= 3.0 and nbsphinx >= 0.8.2 seem to break default ReST roles when
8+
# jupytext notebooks are converted to HTML. Interpreted as italics instead.
69
name: proplot-dev
710
channels:
811
- conda-forge
@@ -24,10 +27,11 @@ dependencies:
2427
- doc8
2528
- pytest
2629
- pytest-sugar
30+
- pyqt5
2731
- sphinx>=3.0
2832
- sphinx-copybutton
2933
- sphinx_rtd_theme==0.4.3
3034
- jupytext
31-
- nbsphinx
32-
- git+https://github.com/lukelbd/sphinx-automodapi@v0.8.proplot-mods
33-
- pyqt5
35+
- jinja2==2.11.3
36+
- nbsphinx==0.8.1
37+
- git+https://github.com/lukelbd/sphinx-automodapi@v0.9.proplot-mods

docs/_static/custom.css

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -376,14 +376,6 @@ hr {
376376
}
377377

378378
/* RTD versions box colors */
379-
/* Also make entire sidebar scrollable but add empty space to the bottom
380-
* of the colling region, rather than truncating the scrollable space */
381-
nav.wy-nav-side .ethical-rtd {
382-
margin-bottom: 3em !important; /* padding below ad or below sidebar */
383-
}
384-
nav.wy-nav-side {
385-
padding-bottom: 0em !important; /* entire sidebar is always scrollable */
386-
}
387379
.rst-versions .rst-current-version {
388380
padding: 0.66em; /* match padding for list items */
389381
color: var(--versions-color);
@@ -407,6 +399,17 @@ nav.wy-nav-side {
407399
color: var(--main-color);
408400
}
409401

402+
/* Make entire sidebar scrollable but add empty space to the bottom
403+
* of the colling region, rather than truncating the scrollable space */
404+
/*
405+
* nav.wy-nav-side .ethical-rtd {
406+
* margin-bottom: 3em !important; #<{(| padding below ad or below sidebar |)}>#
407+
* }
408+
* nav.wy-nav-side {
409+
* padding-bottom: 0em !important; #<{(| entire sidebar is always scrollable |)}>#
410+
* }
411+
*/
412+
410413
/* Next and previous buttons */
411414
.btn {
412415
border: 1px solid var(--block-color);

docs/_static/pygments/abap.css

Lines changed: 0 additions & 60 deletions
This file was deleted.

docs/_static/pygments/algol.css

Lines changed: 0 additions & 44 deletions
This file was deleted.

docs/_static/pygments/algol_nu.css

Lines changed: 0 additions & 44 deletions
This file was deleted.

docs/_static/pygments/arduino.css

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)