diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 10:14:41 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 10:14:41 -0700 |
| commit | eb7da84bee49f6e7b568ee00fd5f3db0bb29f36a (patch) | |
| tree | 767474add641a8c7ea8cfbf3bec69a8116f17c02 | |
| parent | e55d9fbde9a37c430cec9390c487693bc1a69d81 (diff) | |
| parent | e51420c50b27b54086771d0f9077dab4aad82647 (diff) | |
Merge branch '1.14'
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | dev-requirements.txt | 3 | ||||
| -rw-r--r-- | sites/shared_conf.py | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index c7abce9e..3cfef7cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,6 @@ notifications: - "%{repository}@%{branch}: %{message} (%{build_url})" on_success: change on_failure: change - use_notice: true email: false after_success: - coveralls diff --git a/dev-requirements.txt b/dev-requirements.txt index 432c45fd..7a0ccbc5 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,10 +1,9 @@ # Older junk tox>=1.4,<1.5 # For newer tasks like building Sphinx docs. -# NOTE: Requires Python >=2.6 invoke>=0.7.0,<0.8 invocations>=0.5.0 sphinx>=1.1.3 -alabaster>=0.6.0 +alabaster>=0.6.1 releases>=0.5.2 wheel==0.23.0 diff --git a/sites/shared_conf.py b/sites/shared_conf.py index 69908388..4a6a5c4e 100644 --- a/sites/shared_conf.py +++ b/sites/shared_conf.py @@ -12,7 +12,7 @@ html_theme_options = { 'description': "A Python implementation of SSHv2.", 'github_user': 'paramiko', 'github_repo': 'paramiko', - 'gittip_user': 'bitprophet', + 'gratipay_user': 'bitprophet', 'analytics_id': 'UA-18486793-2', 'travis_button': True, } |