httpie: add v2.6.0 (#26791)

Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>

2 files changed, 18 insertions, 13 deletions

diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py
index b94c0bd61a..af5dffc169 100644
--- a/var/spack/repos/builtin/packages/httpie/package.py
+++ b/var/spack/repos/builtin/packages/httpie/package.py
@@ -7,24 +7,26 @@ from spack import *
 
 
 class Httpie(PythonPackage):
-    """Modern command line HTTP client."""
+    """Modern, user-friendly command-line HTTP client for the API era."""
 
-    homepage = "https://httpie.io/"
-    pypi = "httpie/httpie-2.5.0.tar.gz"
+    homepage = 'https://httpie.io/'
+    pypi = 'httpie/httpie-2.6.0.tar.gz'
+    maintainers = ['BoboTiG']
 
+    version('2.6.0', sha256='ef929317b239bbf0a5bb7159b4c5d2edbfc55f8a0bcf9cd24ce597daec2afca5')
     version('2.5.0', sha256='fe6a8bc50fb0635a84ebe1296a732e39357c3e1354541bf51a7057b4877e47f9')
-    version('0.9.9', sha256='f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb')
-    version('0.9.8', sha256='515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1')
-
-    variant('socks', default=True,
-            description='Enable SOCKS proxy support')
+    version('0.9.9', sha256='f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb', deprecated=True)
+    version('0.9.8', sha256='515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1', deprecated=True)
 
+    depends_on('python@3.6:', when='@2.5:', type=('build', 'run'))
     depends_on('py-setuptools', type=('build', 'run'))
-    depends_on('py-defusedxml', type=('build', 'run'))
-    depends_on('py-pygments', type=('build', 'run'))
-    depends_on('py-requests', type=('build', 'run'))
-    depends_on('py-requests-toolbelt', type=('build', 'run'))
-    depends_on('py-pysocks', type=('build', 'run'), when="+socks")
+    depends_on('py-charset-normalizer@2:', when='@2.6:', type=('build', 'run'))
+    depends_on('py-defusedxml@0.6:', when='@2.5:', type=('build', 'run'))
+    depends_on('py-pygments@2.1.3:', type=('build', 'run'))
+    depends_on('py-pygments@2.5.2:', when='@2.5:', type=('build', 'run'))
+    depends_on('py-requests@2.11:', type=('build', 'run'))
+    depends_on('py-requests@2.22:+socks', when='@2.5:', type=('build', 'run'))
+    depends_on('py-requests-toolbelt@0.9.1:', when='@2.5:', type=('build', 'run'))
     # Concretization problem breaks this.  Unconditional for now...
     # https://github.com/spack/spack/issues/3628
     # depends_on('py-argparse@1.2.1:', type=('build', 'run'),
diff --git a/var/spack/repos/builtin/packages/py-requests/package.py b/var/spack/repos/builtin/packages/py-requests/package.py
index ef683fe378..8d1f0d3317 100644
--- a/var/spack/repos/builtin/packages/py-requests/package.py
+++ b/var/spack/repos/builtin/packages/py-requests/package.py
@@ -22,6 +22,8 @@ class PyRequests(PythonPackage):
     version('2.11.1', sha256='5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133')
     version('2.3.0',  sha256='1c1473875d846fe563d70868acf05b1953a4472f4695b7b3566d1d978957b8fc')
 
+    variant('socks', default=False, description='SOCKS and HTTP proxy support')
+
     depends_on('python@2.7:2.8,3.5:', type=('build', 'run'))
     depends_on('py-setuptools', type='build')
 
@@ -33,3 +35,4 @@ class PyRequests(PythonPackage):
     depends_on('py-urllib3@1.21.1:1.26', type=('build', 'run'), when='@2.25.0:')
     depends_on('py-urllib3@1.21.1:1.24,1.25.2:1.25', type=('build', 'run'), when='@2.16.0:2.24')
     depends_on('py-certifi@2017.4.17:', type=('build', 'run'), when='@2.16.0:')
+    depends_on('py-pysocks@1.5.6,1.5.8:', type=('build', 'run'), when='+socks')