From 84f00e7ac44650e713731d8c1ec67ec77d5f4650 Mon Sep 17 00:00:00 2001
From: Matthias Wittgen <matthias.michael.wittgen@cern.ch>
Date: Wed, 25 Mar 2026 15:08:08 -0700
Subject: [PATCH 1/2] Update file to apply cherry-pick

---
 ups/eupspkg.cfg.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ups/eupspkg.cfg.sh b/ups/eupspkg.cfg.sh
index 27c0acaac..8e03102c5 100644
--- a/ups/eupspkg.cfg.sh
+++ b/ups/eupspkg.cfg.sh
@@ -1,5 +1,4 @@
 build() {
-   python setup.py nosetests
    default_build
+   nosetests
 }
-

From 3c2a4b7a0657b2d27a6d400115544011007dc6d3 Mon Sep 17 00:00:00 2001
From: Tim Jenness <tjenness@lsst.org>
Date: Fri, 24 Jan 2025 16:50:25 -0700
Subject: [PATCH 2/2] Switch from nose to pytest in eups build

nosetests is broken on rubinenv 10
---
 ups/eupspkg.cfg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ups/eupspkg.cfg.sh b/ups/eupspkg.cfg.sh
index 8e03102c5..0cc847389 100644
--- a/ups/eupspkg.cfg.sh
+++ b/ups/eupspkg.cfg.sh
@@ -1,4 +1,4 @@
 build() {
    default_build
-   nosetests
+   pytest --log-cli-level=INFO tests
 }