Skip to content

Commit

Permalink
Merge branch 'master' of github.com:csdms/pymt into mdpiper/fix-faili…
Browse files Browse the repository at this point in the history
…ng-test

Pull in upstream changes.
  • Loading branch information
mdpiper committed Jan 13, 2020
2 parents 0784931 + 900c91f commit 0245434
Show file tree
Hide file tree
Showing 33 changed files with 2,347 additions and 1,072 deletions.
2 changes: 2 additions & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Contributors
------------

* Niels Drost
* Tian Gan
* Albert Kettner
* Irina Overeem
* Scott Stewart
* Kang Wang
10 changes: 7 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,21 @@
<img src="https://ci.appveyor.com/api/projects/status/bf8g17c05ugvhvfe/branch/master"></a>
<a href="https://coveralls.io/github/csdms/pymt?branch=master">
<img alt="Coverage Status" src="https://coveralls.io/repos/github/csdms/pymt/badge.svg?branch=master"></a>
<a href="https://landscape.io/github/csdms/pymt/master">
<img alt="Code Health" src="https://landscape.io/github/csdms/pymt/master/landscape.svg"></a>
<a href="https://opensource.org/licenses/MIT">
<img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg"></a>
<a href="https://github.com/csdms/pymt">
<img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg"></a>
<a href="https://www.codacy.com/app/mcflugen/pymt?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=csdms/pymt&amp;utm_campaign=Badge_Grade">
<img src="https://api.codacy.com/project/badge/Grade/e8e273131ecb4d7d981fe9f4cf3e83d9"/></a>

<a href="https://mybinder.org/v2/gh/csdms/pymt.git/master?filepath=notebooks%2Fwelcome.ipynb">
<img alt="Launch Binder" src="https://static.mybinder.org/badge_logo.svg"></a>
</p>

Quick links:
* `User documentation <https://pymt.readthedocs.io/>`_
* `Installation instructions <https://pymt.readthedocs.io/en/latest/install.html>`_
* `List of available models <https://pymt.readthedocs.io/en/latest/models.html>`_

PyMT is an Open Source Python package, developed by the
`Community Surface Dynamics Modeling System <https://csdms.colorado.edu>`_
(CSDMS), that provides the necessary tools used for the coupling of models
Expand Down
1 change: 1 addition & 0 deletions docs/_static/apple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/_static/linux.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/_static/windows.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@

# sys.path.insert(0, os.path.abspath('..'))
from unittest.mock import MagicMock
from sphinx.domains.python import PythonDomain


class PatchedPythonDomain(PythonDomain):
def resolve_xref(self, env, fromdocname, builder, typ, target, node, contnode):
if 'refspecific' in node:
del node['refspecific']
return super(PatchedPythonDomain, self).resolve_xref(
env, fromdocname, builder, typ, target, node, contnode)


def setup(sphinx):
sphinx.override_domain(PatchedPythonDomain)


class Mock(MagicMock):
Expand Down
Loading

0 comments on commit 0245434

Please sign in to comment.