Fix awscli and deps (#35158)

* py-docutils/py-pyyaml specify python 3.11 compat

* bump awscli / py-botocore

* fix botocore again

* review fixes

* .

4 files changed, 27 insertions, 7 deletions

diff --git a/var/spack/repos/builtin/packages/awscli/package.py b/var/spack/repos/builtin/packages/awscli/package.py
index 8c1116e611..0c60b444e7 100644
--- a/var/spack/repos/builtin/packages/awscli/package.py
+++ b/var/spack/repos/builtin/packages/awscli/package.py
@@ -13,16 +13,29 @@ class Awscli(PythonPackage):
 
     pypi = "awscli/awscli-1.16.308.tar.gz"
 
+    version("1.27.56", sha256="58fd7122547db71646c053c914bd4f9b673356dd8c9520ae6d35560a8aec208b")
     version("1.16.308", sha256="3632fb1db2538128509a7b5e89f2a2c4ea3426bec139944247bddc4d79bf7603")
     version("1.16.179", sha256="6a87114d1325358d000abe22b2103baae7b91f053ff245b9fde33cb0affb5e4f")
 
     depends_on("py-setuptools", type="build")
+    depends_on("python@3.7:", when="@1.25:", type=("build", "run"))
+
+    # py-botocore is pinned to the patch version number
+    depends_on("py-botocore@1.29.56", when="@1.27", type=("build", "run"))
     depends_on("py-botocore@1.13.44", when="@1.16.308", type=("build", "run"))
     depends_on("py-botocore@1.12.169", when="@1.16.179", type=("build", "run"))
-    depends_on("py-docutils@0.10:0.15", type=("build", "run"))
-    depends_on("py-rsa@3.1.2:3.5.0", type=("build", "run"))
-    depends_on("py-s3transfer@0.2.0:0.2", type=("build", "run"))
-    depends_on("py-pyyaml@3.10:5.2", type=("build", "run"))
-    depends_on("py-colorama@0.2.5:0.4.1", type=("build", "run"))
-    depends_on("py-nose", type="test")
-    depends_on("py-mock@1.3.0:", type="test")
+
+    depends_on("py-colorama@0.2.5:0.4.4", when="@1.27", type=("build", "run"))
+    depends_on("py-colorama@0.2.5:0.3.9", when="@1.16", type=("build", "run"))
+
+    depends_on("py-docutils@0.10:0.16", when="@1.27", type=("build", "run"))
+    depends_on("py-docutils@0.10:0.15", when="@1.16", type=("build", "run"))
+
+    depends_on("py-pyyaml@3.10:5.4", when="@1.27", type=("build", "run"))
+    depends_on("py-pyyaml@3.10:5.2", when="@1.16", type=("build", "run"))
+
+    depends_on("py-rsa@3.1.2:4.7", when="@1.27", type=("build", "run"))
+    depends_on("py-rsa@3.1.2:3.5.0", when="@1.16", type=("build", "run"))
+
+    depends_on("py-s3transfer@0.6.0:0.6", when="@1.27", type=("build", "run"))
+    depends_on("py-s3transfer@0.2.0:0.2", when="@1.16", type=("build", "run"))
diff --git a/var/spack/repos/builtin/packages/py-botocore/package.py b/var/spack/repos/builtin/packages/py-botocore/package.py
index 9a5e13548a..0b5fb4cb0e 100644
--- a/var/spack/repos/builtin/packages/py-botocore/package.py
+++ b/var/spack/repos/builtin/packages/py-botocore/package.py
@@ -12,6 +12,7 @@ class PyBotocore(PythonPackage):
     homepage = "https://github.com/boto/botocore"
     pypi = "botocore/botocore-1.13.44.tar.gz"
 
+    version("1.29.56", sha256="ca4d6403d745218270a20d9ca3ca9a33e3ad2fabb59a96ed8d6e1a824b274c86")
     version("1.29.26", sha256="f71220fe5a5d393c391ed81a291c0d0985f147568c56da236453043f93727a34")
     version("1.28.5", sha256="f322d7b62163219ffeb787a116d318273dfb7243c3b49d95f5bfff8daa1df4e0")
     version("1.27.96", sha256="fc0a13ef6042e890e361cf408759230f8574409bb51f81740d2e5d8ad5d1fbea")
diff --git a/var/spack/repos/builtin/packages/py-docutils/package.py b/var/spack/repos/builtin/packages/py-docutils/package.py
index 53f97e46fa..c70e7a55ba 100644
--- a/var/spack/repos/builtin/packages/py-docutils/package.py
+++ b/var/spack/repos/builtin/packages/py-docutils/package.py
@@ -35,6 +35,9 @@ class PyDocutils(PythonPackage):
     depends_on("python@2.4:", when="@:0.13", type=("build", "run"))
     depends_on("py-setuptools", when="@0.15:", type="build")
 
+    # Includes "longintrepr.h" instead of Python.h
+    conflicts("^python@3.11:", when="@:0.15")
+
     # NOTE: This creates symbolic links to be able to run docutils scripts
     # without .py file extension similarly to various linux distributions to
     # increase compatibility with other packages
diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py
index 78074f9126..9a530db7f5 100644
--- a/var/spack/repos/builtin/packages/py-pyyaml/package.py
+++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py
@@ -31,6 +31,9 @@ class PyPyyaml(PythonPackage):
     depends_on("py-setuptools", type="build")
     depends_on("py-cython", when="@6:+libyaml", type="build")
 
+    # Includes "longintrepr.h" instead of Python.h
+    conflicts("^python@3.11:", when="@:5.3")
+
     @property
     def import_modules(self):
         modules = ["yaml"]