[airflow] 14/47: Removes unnecessary packages from setup_requires (#16139)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v2-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit a651f4f7f4490f8af2f53f27045d4d8a2a796105
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Fri May 28 17:33:47 2021 +0200

    Removes unnecessary packages from setup_requires (#16139)
    
    This change removes unnecessary dependencies from setup_requires:
    
    * docutils are not needed in setup requires and actually
      having them here caused harmful upgrade even if docutils
      are limited to <0.17 elsewhere
    * setup_tools should not be needed in setup_requires (by
      the time setup_requires are parsed, they should be already
      installed
    * bowler is not needed any more in setup.py (we got rid of it
      when we got rid of backport packages.
    
    Also docutils<0.17 limitation is moved to install_requires
    because docutils was already a transitive dependency of
    airflow without extras and it could be upgraded even if there
    is a limitation in extra.
    
    (cherry picked from commit b6059877ad9c3e4d6e88fcc7cd3ab8990600d240)
---
 setup.cfg | 9 ++++++---
 setup.py  | 6 ------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 813e6c5..fc438d4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -68,10 +68,7 @@ include_package_data = True
 python_requires = ~=3.6
 packages = find:
 setup_requires =
-    bowler
-    docutils
     gitpython
-    setuptools
     wheel
 #####################################################################################################
 # IMPORTANT NOTE!!!!!!!!!!!!!!!
@@ -94,6 +91,12 @@ install_requires =
     cryptography>=0.9.3
     dataclasses;python_version<"3.7"
     dill>=0.2.2, <0.4
+    # Sphinx RTD theme 0.5.2. introduced limitation to docutils to account for some docutils markup
+    # change:
+    #      https://github.com/readthedocs/sphinx_rtd_theme/issues/1112
+    # This limitation can be removed after this issue is closed:
+    #      https://github.com/readthedocs/sphinx_rtd_theme/issues/1115
+    docutils<0.17
     flask>=1.1.0, <2.0
     flask-appbuilder~=3.3
     flask-caching>=1.5.0, <2.0.0
diff --git a/setup.py b/setup.py
index 5eedaaa..f720a40 100644
--- a/setup.py
+++ b/setup.py
@@ -502,12 +502,6 @@ devel = [
     'bowler',
     'click~=7.1',
     'coverage',
-    # Sphinx RTD theme 0.5.2. introduced limitation to docutils to account for some docutils markup
-    # change:
-    #      https://github.com/readthedocs/sphinx_rtd_theme/issues/1112
-    # This limitation can be removed after this issue is closed:
-    #      https://github.com/readthedocs/sphinx_rtd_theme/issues/1115
-    'docutils<0.17',
     'filelock',
     'flake8>=3.6.0',
     'flake8-colors',