From 9a9a8cc8639470e5e87e4e131d3f8a2323a5ba07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Wed, 13 Sep 2017 21:05:23 +0300 Subject: [PATCH 1/2] Upgrade setuptools to 36.4.0 This allows projects to specify their metadata in setup.cfg instead of setup.py. --- readthedocs/doc_builder/python_environments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index f5c55f5f44f..9ef2214878e 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -116,7 +116,7 @@ def install_core_requirements(self): """Install basic Read the Docs requirements into the virtualenv.""" requirements = [ 'Pygments==2.2.0', - 'setuptools==28.8.0', + 'setuptools==36.4.0', 'docutils==0.13.1', 'mock==1.0.1', 'pillow==2.6.1', From d27d0c2efcfa680fce13abe31aeebcbd85ab0b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Wed, 4 Oct 2017 23:22:09 +0300 Subject: [PATCH 2/2] Update python_environments.py --- readthedocs/doc_builder/python_environments.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readthedocs/doc_builder/python_environments.py b/readthedocs/doc_builder/python_environments.py index 9ef2214878e..d0d19cd8c52 100644 --- a/readthedocs/doc_builder/python_environments.py +++ b/readthedocs/doc_builder/python_environments.py @@ -116,7 +116,7 @@ def install_core_requirements(self): """Install basic Read the Docs requirements into the virtualenv.""" requirements = [ 'Pygments==2.2.0', - 'setuptools==36.4.0', + 'setuptools==36.5.0', 'docutils==0.13.1', 'mock==1.0.1', 'pillow==2.6.1',