Skip to content

Commit a712b88

Browse files
committed
Merge remote-tracking branch 'upstream/master' into 0.15-whats-new
* upstream/master: setuptools-scm (3) (pydata#3724) Fix Sphinx links on contributing doc page (pydata#3710)
2 parents bb53bb7 + b350561 commit a712b88

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

doc/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ About the *xarray* documentation
231231
--------------------------------
232232

233233
The documentation is written in **reStructuredText**, which is almost like writing
234-
in plain English, and built using `Sphinx <http://sphinx.pocoo.org/>`__. The
234+
in plain English, and built using `Sphinx <http://sphinx-doc.org/>`__. The
235235
Sphinx Documentation has an excellent `introduction to reST
236-
<http://sphinx.pocoo.org/rest.html>`__. Review the Sphinx docs to perform more
236+
<http://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html>`__. Review the Sphinx docs to perform more
237237
complex changes to the documentation as well.
238238

239239
Some other important things to know about the docs:

requirements.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# This file is redundant with setup.cfg;
2+
# it exists to let GitHub build the repository dependency graph
3+
# https://help.github.com/en/github/visualizing-repository-data-with-graphs/listing-the-packages-that-a-repository-depends-on
4+
5+
numpy >= 1.15
6+
pandas >= 0.25

0 commit comments

Comments
 (0)