Skip to content

MNT:(deps): Bump sphinx from 2.4.4 to 3.1.2 in /ci #1415

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.

Sign up for GitHub

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
dopplershift merged 3 commits into from
Aug 7, 2020
Merged

MNT:(deps): Bump sphinx from 2.4.4 to 3.1.2 in /ci #1415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8007700
MNT:(deps): Bump sphinx from 2.4.4 to 3.1.2 in /ci
dependabot[bot] Jul 28, 2020
5ee1b81
DOC: Fix building with Sphinx 3
dopplershift Aug 7, 2020
7f4842b
BUG: Fix __all__ in metpy.plots
dopplershift Aug 7, 2020
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
4 changes: 2 additions & 2 deletions ci/doc_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sphinx==2.4.4
sphinx==3.1.2
sphinx-gallery==0.7
m2r==0.2.1
myst_parser==0.10.0
netCDF4==1.5.3
# Needed for sphinx-gallery, which refuses to list dependencies
pillow==7.2.0
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
'sphinx.ext.viewcode',
'sphinx_gallery.gen_gallery',
'matplotlib.sphinxext.plot_directive',
'm2r'
'myst_parser'
]

sphinx_gallery_conf = {
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ install_requires =
where = src

[options.extras_require]
doc = sphinx<3.0; sphinx-gallery>=0.4; m2r; netCDF4
doc = sphinx; sphinx-gallery>=0.4; myst-parser; netCDF4
examples = cartopy>=0.15.0; matplotlib>=2.2.0; pyproj>=1.9.4,!=2.0.0
test = pytest>=2.4; pytest-mpl; cartopy>=0.16.0; netCDF4; pyproj>=1.9.4,!=2.0.0

Expand Down
11 changes: 6 additions & 5 deletions src/metpy/plots/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

# Trigger matplotlib wrappers
from . import _mpl # noqa: F401
from ._util import add_metpy_logo, add_timestamp, add_unidata_logo, convert_gempak_color
from ._util import (add_metpy_logo, add_timestamp, add_unidata_logo, # noqa: F401
convert_gempak_color)
from .ctables import * # noqa: F403
from .declarative import * # noqa: F403
from .skewt import * # noqa: F403
Expand All @@ -21,10 +22,10 @@
__all__.extend(skewt.__all__) # pylint: disable=undefined-variable
__all__.extend(station_plot.__all__) # pylint: disable=undefined-variable
__all__.extend(wx_symbols.__all__) # pylint: disable=undefined-variable
__all__.extend([add_metpy_logo, add_timestamp, add_unidata_logo,
convert_gempak_color]) # pylint: disable=undefined-variable
__all__.extend(['add_metpy_logo', 'add_timestamp', 'add_unidata_logo',
'convert_gempak_color'])
try:
from .cartopy_utils import USCOUNTIES, USSTATES
__all__.extend([USCOUNTIES, USSTATES])
from .cartopy_utils import USCOUNTIES, USSTATES # noqa: F401
__all__.extend(['USCOUNTIES', 'USSTATES'])
except ImportError:
logger.warning('Cannot import USCOUNTIES and USSTATES without Cartopy installed.')