From e550665df7b62f4ad205f84081c09375a8e6f4e8 Mon Sep 17 00:00:00 2001
From: Sam Grayson <sam@samgrayson.me>
Date: Mon, 5 Dec 2022 22:52:05 -0700
Subject: Update packages (#34344)
---
var/spack/repos/builtin/packages/py-jsmin/package.py | 4 ++++
var/spack/repos/builtin/packages/py-msal/package.py | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/var/spack/repos/builtin/packages/py-jsmin/package.py b/var/spack/repos/builtin/packages/py-jsmin/package.py
index f6a245390c..bcde5f6470 100644
--- a/var/spack/repos/builtin/packages/py-jsmin/package.py
+++ b/var/spack/repos/builtin/packages/py-jsmin/package.py
@@ -13,6 +13,10 @@ class PyJsmin(PythonPackage):
homepage = "https://github.com/tikitu/jsmin/"
pypi = "jsmin/jsmin-2.2.2.tar.gz"
+ version("3.0.1", sha256="c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc")
version("2.2.2", sha256="b6df99b2cd1c75d9d342e4335b535789b8da9107ec748212706ef7bbe5c2553b")
depends_on("py-setuptools", type="build")
+ # They use use_2to3, so must be setuptools<58
+ # https://github.com/tikitu/jsmin/blob/release-2.2.2/setup.py#L10
+ depends_on("py-setuptools@:57", type="build", when="@:2")
diff --git a/var/spack/repos/builtin/packages/py-msal/package.py b/var/spack/repos/builtin/packages/py-msal/package.py
index 49899f591e..1fe6831a3f 100644
--- a/var/spack/repos/builtin/packages/py-msal/package.py
+++ b/var/spack/repos/builtin/packages/py-msal/package.py
@@ -16,9 +16,14 @@ class PyMsal(PythonPackage):
homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python"
pypi = "msal/msal-1.3.0.tar.gz"
+ # If you get diamond dependency problems on py-pyjwt,
+ # consider using v1.20.0, which has looser constraints
+ version("1.20.0", sha256="78344cd4c91d6134a593b5e3e45541e666e37b747ff8a6316c3668dd1e6ab6b2")
version("1.3.0", sha256="5442a3a9d006506e653d3c4daff40538bdf067bf07b6b73b32d1b231d5e77a92")
version("1.0.0", sha256="ecbe3f5ac77facad16abf08eb9d8562af3bc7184be5d4d90c9ef4db5bde26340")
depends_on("py-setuptools", type="build")
depends_on("py-requests@2.0.0:2", type=("build", "run"))
- depends_on("py-pyjwt@1.0.0:1+crypto", type=("build", "run"))
+ depends_on("py-pyjwt@1.0.0:1+crypto", type=("build", "run"), when="@:1.3")
+ depends_on("py-pyjwt@1.0.0:2+crypto", type=("build", "run"), when="@1.20:")
+ depends_on("py-cryptography@0.6:40", type=("build", "run"), when="@1.20:")
--
cgit v1.2.3-70-g09d2