From 8e636e71629b41371e4c42e047cd4ce88e1b4be6 Mon Sep 17 00:00:00 2001
From: Eleni Mathioulaki <emathioulaki@athenarc.gr>
Date: Wed, 28 Jun 2023 09:58:13 +0200
Subject: [PATCH] fix pytest dependency
---
packages/py-tvb-framework/package.py | 4 +++-
packages/py-tvb-library/package.py | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/packages/py-tvb-framework/package.py b/packages/py-tvb-framework/package.py
index e770ae95..c0922e6b 100644
--- a/packages/py-tvb-framework/package.py
+++ b/packages/py-tvb-framework/package.py
@@ -62,7 +62,9 @@ class PyTvbFramework(PythonPackage):
depends_on('py-tvb-storage', type=('build', 'run'))
depends_on('py-werkzeug', type=('build', 'run'))
- depends_on('py-pytest', type='test')
+ # pytest@7.2: does not depend on py-py, which is needed for py-pytest-benchmark@:3 (https://github.com/ionelmc/pytest-benchmark/issues/226)
+ # simplest way to address this is to add an upper limit for pytest for now
+ depends_on('py-pytest@:7.1', type='test')
depends_on('py-pytest-benchmark', type='test')
depends_on('py-pytest-mock', type='test')
depends_on('py-beautifulsoup4', type='test')
diff --git a/packages/py-tvb-library/package.py b/packages/py-tvb-library/package.py
index f649e09f..21cea4ef 100644
--- a/packages/py-tvb-library/package.py
+++ b/packages/py-tvb-library/package.py
@@ -54,7 +54,9 @@ class PyTvbLibrary(PythonPackage):
depends_on('py-tvb-data', type=('run', 'test'))
depends_on('py-tvb-gdist', type=('run', 'test'))
- depends_on('py-pytest', type='test')
+ # pytest@7.2: does not depend on py-py, which is needed for py-pytest-benchmark@:3 (https://github.com/ionelmc/pytest-benchmark/issues/226)
+ # simplest way to address this is to add an upper limit for pytest for now
+ depends_on('py-pytest@:7.1', type='test')
depends_on('py-h5py', type='test')
depends_on('py-pytest-benchmark', type='test')
depends_on('py-pytest-xdist', type='test')
--
GitLab