Merge with master

1 files changed, 3 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 7d20480b..21b0aaa8 100755
--- a/setup.py
+++ b/setup.py
@@ -61,8 +61,6 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \
 
 needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
 pytest_runner = ['pytest-runner'] if needs_pytest else []
-needs_sphinx = set(['build_sphinx', 'upload_docs', 'release']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker>=1.5'] if needs_sphinx else []
 needs_wheel = set(['release', 'bdist_wheel']).intersection(sys.argv)
 wheel = ['wheel'] if needs_wheel else []
 
@@ -146,10 +144,10 @@ setup_params = dict(
         """).strip().splitlines(),
     extras_require={
         "ssl:sys_platform=='win32'": "wincertstore==0.2",
-        "certs": "certifi==2015.11.20",
+        "certs": "certifi==2016.2.28",
     },
     dependency_links=[
-        'https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz#md5=25134646672c695c1ff1593c2dd75d08',
+        'https://pypi.python.org/packages/source/c/certifi/certifi-2016.2.28.tar.gz#md5=5d672aa766e1f773c75cfeccd02d3650',
         'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip#md5=ae728f2f007185648d0c7a8679b361e2',
     ],
     scripts=[],
@@ -159,7 +157,7 @@ setup_params = dict(
     ] + (['mock'] if sys.version_info[:2] < (3, 3) else []),
     setup_requires=[
         'setuptools_scm>=1.9',
-    ] + sphinx + pytest_runner + wheel,
+    ] + pytest_runner + wheel,
 )
 
 if __name__ == '__main__':