diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-10-18 13:34:15 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-10-18 13:34:15 -0700 |
| commit | 8c839bfeeab00be6702f9d9230c60a858c51f467 (patch) | |
| tree | 1a1f2f9a4d5ec8c65b397ccb5ee1e843b4fc7bba | |
| parent | fc83badb37db09bb875195ccd44203d8aa3de50b (diff) | |
| parent | d591ea7d74808db19041844e27cf9d5e183b417f (diff) | |
Merge branch '2.2' into 2.3
| -rw-r--r-- | dev-requirements.txt | 2 | ||||
| -rw-r--r-- | sites/shared_conf.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index c192f144..b4829cb3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -12,7 +12,7 @@ coverage==3.7.1 codecov==1.6.3 # Documentation tools sphinx>=1.4,<1.7 -alabaster>=0.7,<2.0 +alabaster==0.7.12 releases>=1.5,<2.0 # Release tools semantic_version>=2.4,<2.5 diff --git a/sites/shared_conf.py b/sites/shared_conf.py index aaea43cc..4d6a7b27 100644 --- a/sites/shared_conf.py +++ b/sites/shared_conf.py @@ -14,6 +14,7 @@ html_theme_options = { "github_repo": "paramiko", "analytics_id": "UA-18486793-2", "travis_button": True, + "tidelift_url": "https://tidelift.com/subscription/pkg/pypi-paramiko?utm_source=pypi-paramiko&utm_medium=referral&utm_campaign=docs", } html_sidebars = { "**": ["about.html", "navigation.html", "searchbox.html", "donate.html"] |