From 6982a45a30b38fdaae433841763b63b48e937283 Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Fri, 11 Jun 2021 11:13:21 +0200
Subject: [PATCH 1/3] Add astor to TensorFlow 2019b dependencies

---
 .../t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb   | 3 +++
 .../TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb | 3 +++
 .../t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb   | 3 +++
 .../TensorFlow/TensorFlow-2.4.1-fosscuda-2019b-Python-3.7.4.eb | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb
index 60127614918..8ac1e4d0284 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb
@@ -121,6 +121,9 @@ exts_list = [
         'unpack_sources': False,
         'checksums': ['d09dacdd127f2579cea8d5af21f4a918036b8ae246adc82f26b61f91cc247dc2'],
     }),
+    ('astor', '0.8.1', {
+        'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
+    }),
     ('gast', '0.3.3', {
         'checksums': ['b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57'],
     }),
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb
index c6e8b97aecb..be0e6502d2d 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb
@@ -123,6 +123,9 @@ exts_list = [
         'unpack_sources': False,
         'checksums': ['d09dacdd127f2579cea8d5af21f4a918036b8ae246adc82f26b61f91cc247dc2'],
     }),
+    ('astor', '0.8.1', {
+        'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
+    }),
     ('gast', '0.3.3', {
         'checksums': ['b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57'],
     }),
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
index c66b375190c..090906c6ed3 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
@@ -117,6 +117,9 @@ exts_list = [
         'unpack_sources': False,
         'checksums': ['d09dacdd127f2579cea8d5af21f4a918036b8ae246adc82f26b61f91cc247dc2'],
     }),
+    ('astor', '0.8.1', {
+        'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
+    }),
     ('gast', '0.3.3', {
         'checksums': ['b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57'],
     }),
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.4.1-fosscuda-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.4.1-fosscuda-2019b-Python-3.7.4.eb
index 44857f51abf..4e0097c9ccd 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.4.1-fosscuda-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.4.1-fosscuda-2019b-Python-3.7.4.eb
@@ -118,6 +118,9 @@ exts_list = [
         'unpack_sources': False,
         'checksums': ['5b7b7bf2debe19a8794adacc43e8ba6459daa4efaf54d3302623994a359b17f0'],
     }),
+    ('astor', '0.8.1', {
+        'checksums': ['6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e'],
+    }),
     ('gast', '0.3.3', {
         'checksums': ['b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57'],
     }),

From 440963a40c6d151f1b9f1db429522f2abcfc8d7d Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Fri, 11 Jun 2021 12:18:55 +0200
Subject: [PATCH 2/3] Remove source_urls and cleanup

---
 .../t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb | 5 +----
 .../TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb          | 5 +----
 .../t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb
index 8ac1e4d0284..2776da7b8a2 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-foss-2019b-Python-3.7.4.eb
@@ -45,10 +45,7 @@ dependencies = [
     ('scipy', '1.4.1', versionsuffix),
 ]
 
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'sanity_pip_check': True,
-}
+sanity_pip_check = True
 use_pip = True
 
 exts_list = [
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb
index be0e6502d2d..4701a110d4c 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.0-fosscuda-2019b-Python-3.7.4.eb
@@ -47,10 +47,7 @@ dependencies = [
     ('scipy', '1.4.1', versionsuffix),
 ]
 
-exts_default_options = {
-    'source_urls': [PYPI_SOURCE],
-    'sanity_pip_check': True,
-}
+sanity_pip_check = True
 use_pip = True
 
 exts_list = [
diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
index 090906c6ed3..e81315c6bc2 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
@@ -45,6 +45,7 @@ dependencies = [
     ('scipy', '1.4.1', versionsuffix),
 ]
 
+sanity_pip_check = True
 use_pip = True
 
 exts_list = [

From 01c7730740d0249317d5592842ad749005f3d023 Mon Sep 17 00:00:00 2001
From: Alexander Grund <alexander.grund@tu-dresden.de>
Date: Fri, 11 Jun 2021 13:49:37 +0200
Subject: [PATCH 3/3] Remove duplicate value

---
 .../t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
index e81315c6bc2..33d60128d6d 100644
--- a/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
+++ b/easybuild/easyconfigs/t/TensorFlow/TensorFlow-2.2.2-foss-2019b-Python-3.7.4.eb
@@ -156,6 +156,4 @@ exts_list = [
     }),
 ]
 
-sanity_pip_check = True
-
 moduleclass = 'lib'