Increase docutils upper bound to <0.18

aws · Oct 24, 2021 · 8a1a956 · 8a1a956
1 parent c0edee0
commit 8a1a956
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -1,3 +1,3 @@
-docutils>=0.10,<0.16
+docutils>=0.10,<0.18
 Sphinx==1.2.3
 -e .
diff --git a/setup.cfg b/setup.cfg
@@ -4,7 +4,7 @@ universal = 0
 [metadata]
 requires_dist =
         botocore==1.22.2
-        docutils>=0.10,<0.16
+        docutils>=0.10,<0.18
         s3transfer>=0.5.0,<0.6.0
         PyYAML>=3.10,<5.5
         colorama>=0.2.5,<0.4.4

diff --git a/setup.py b/setup.py
@@ -24,8 +24,13 @@ def find_version(*file_paths):
 
 
 install_requires = [
+<<<<<<< HEAD
     'botocore==1.22.2',
     'docutils>=0.10,<0.16',
+=======
+    'botocore==1.21.56',
+    'docutils>=0.10,<0.18',
+>>>>>>> 19c0b91fd... Increase docutils upper bound to <0.18
     's3transfer>=0.5.0,<0.6.0',
     'PyYAML>=3.10,<5.5',
     'colorama>=0.2.5,<0.4.4',