From ec4ac26f41b89eecfe02eb2af421c29c0cfd3a68 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 1 May 2024 17:28:14 +0200 Subject: [PATCH 1/3] Fix pytest to 8.1.1 --- nrn_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nrn_requirements.txt b/nrn_requirements.txt index 77ccb32ddc..2764589207 100644 --- a/nrn_requirements.txt +++ b/nrn_requirements.txt @@ -8,7 +8,7 @@ bokeh<3 ipython cython<3 packaging -pytest +pytest==8.1.1 # Bug from 8.2.0 due to parallelism? pytest-cov mpi4py numpy From f0a4da926ac1b341087a4adddf4783c36a4cbf20 Mon Sep 17 00:00:00 2001 From: Pramod S Kumbhar Date: Wed, 1 May 2024 20:58:30 +0200 Subject: [PATCH 2/3] wip: update also nmodl with pytest<=8.1.1 --- external/nmodl | 2 +- nrn_requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/nmodl b/external/nmodl index 2fb037e1f8..a47fa1d442 160000 --- a/external/nmodl +++ b/external/nmodl @@ -1 +1 @@ -Subproject commit 2fb037e1f8d60d522ba16bd968c69a318ce5a827 +Subproject commit a47fa1d442d516f3bd05f98a6f03ccb8514fefdb diff --git a/nrn_requirements.txt b/nrn_requirements.txt index 2764589207..a7d8bcbcde 100644 --- a/nrn_requirements.txt +++ b/nrn_requirements.txt @@ -8,7 +8,7 @@ bokeh<3 ipython cython<3 packaging -pytest==8.1.1 # Bug from 8.2.0 due to parallelism? +pytest<=8.1.1 # potential bug from 8.2.0 due to parallelism? pytest-cov mpi4py numpy From a134952dd2acf75a19f56328baa109c92b31f212 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Wed, 1 May 2024 23:18:54 +0200 Subject: [PATCH 3/3] Fix nmodl --- external/nmodl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/nmodl b/external/nmodl index a47fa1d442..70553cc4d9 160000 --- a/external/nmodl +++ b/external/nmodl @@ -1 +1 @@ -Subproject commit a47fa1d442d516f3bd05f98a6f03ccb8514fefdb +Subproject commit 70553cc4d9092aafed42aa49ac4e730830af1124