From 1f021880eb62b8013620e973aaa51886f0490feb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 17 Dec 2020 21:52:12 +0100 Subject: [PATCH 1/6] pytest for temperature now fully working --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index e1a1048e1..24828314c 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit e1a1048e1f593683b4b432d41455bd236008c3ad +Subproject commit 24828314c82a8bb2f011b060965cea79660c6f09 From 5b67cadb5173a65275f218c0de78ed9d17ffa2ec Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 17 Dec 2020 21:58:51 +0100 Subject: [PATCH 2/6] test not needed anymore --- .gitlab-ci.yml | 7 ------- PRIVATE | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e90638c5..c67516ce2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -269,13 +269,6 @@ Thermal: - master - release -Nonlocal_Damage_DetectChanges: - stage: grid - script: Nonlocal_Damage_DetectChanges/test.py - except: - - master - - release - Plasticity_DetectChanges: stage: grid script: Plasticity_DetectChanges/test.py diff --git a/PRIVATE b/PRIVATE index 24828314c..b6e6d9202 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 24828314c82a8bb2f011b060965cea79660c6f09 +Subproject commit b6e6d9202f27e7e5aee2a38c3529bbf9c7bdaeab From 2b54c074167005594e40c0b9a2cade10a575f569 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 17 Dec 2020 22:02:27 +0100 Subject: [PATCH 3/6] not needed anymore --- .gitlab-ci.yml | 7 ------- PRIVATE | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c67516ce2..ca1b2959a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -262,13 +262,6 @@ Pytest_grid: - master - release -Thermal: - stage: grid - script: Thermal/test.py - except: - - master - - release - Plasticity_DetectChanges: stage: grid script: Plasticity_DetectChanges/test.py diff --git a/PRIVATE b/PRIVATE index b6e6d9202..9a184b4a9 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit b6e6d9202f27e7e5aee2a38c3529bbf9c7bdaeab +Subproject commit 9a184b4a906d0a239febd72e50b06fb9d31fb765 From afc53e5d9f817772dfc36989de39960dd2df066d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 18 Dec 2020 12:17:26 +0100 Subject: [PATCH 4/6] one more test migrated to pytest --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 9a184b4a9..a6a4eba5b 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 9a184b4a906d0a239febd72e50b06fb9d31fb765 +Subproject commit a6a4eba5bd3dfb2600b6bb5bed70e3e2045705bc From 877a489ea573d747f2126ba244ed5b49763b0c22 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 18 Dec 2020 17:41:00 +0100 Subject: [PATCH 5/6] improved tests --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index a6a4eba5b..313dd5de6 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit a6a4eba5bd3dfb2600b6bb5bed70e3e2045705bc +Subproject commit 313dd5de618c996cdf9ace95a096f25e757386d9 From 3ea05cabadb680c16e0dead27f5f30142bd58e24 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 21 Dec 2020 21:32:13 +0100 Subject: [PATCH 6/6] [skip ci] updated version information after successful test of v3.0.0-alpha2-68-gbc32797fa --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 85027fcd3..72db22a20 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v3.0.0-alpha2-42-g6cc78cb41 +v3.0.0-alpha2-68-gbc32797fa