Change dependencies in the Conda environment.

We can remove the dependency on sphinxcontrib, since sphinx.ext.napoleon is
already available. This means we can drop conda-forge, which substantially
reduces build memory usage (see: readthedocs/readthedocs.org#6742,
conda/conda#5003, conda/conda#8650, readthedocs/readthedocs.org#6692).

Bump Sphinx to 2.4.0, while we're at it.
pull/7294/head
David L. Jones 5 years ago
parent 4fa3c8e883
commit 228fbf513d
  1. 2
      python/docs/conf.py
  2. 6
      python/docs/environment.yml

@ -71,7 +71,7 @@ extensions = [
"sphinx.ext.autosummary", "sphinx.ext.autosummary",
"sphinx.ext.ifconfig", "sphinx.ext.ifconfig",
"sphinx.ext.intersphinx", "sphinx.ext.intersphinx",
"sphinxcontrib.napoleon", "sphinx.ext.napoleon",
] ]
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.

@ -1,12 +1,10 @@
name: protobuf name: protobuf
channels: channels:
- conda-forge
- defaults - defaults
dependencies: dependencies:
- libprotobuf=3.11.2 - libprotobuf=3.11.4
- make=4.2.1 - make=4.2.1
- pip=19.3.1 - pip=19.3.1
- python=3.7.6 - python=3.7.6
- sphinx=2.3.1 - sphinx=2.4.0
- sphinx_rtd_theme=0.4.3 - sphinx_rtd_theme=0.4.3
- sphinxcontrib-napoleon=0.7

Loading…
Cancel
Save