Merge pull request #3510 from boegel/container_pip_install_easybuild

update installation procedure for EasyBuild in generated Singularity container recipes

Author: bartoldeman

easybuild/tools/containers/singularity.py

@@ -314,13 +314,6 @@ def resolve_template_data(self):
                 "# install EasyBuild using pip",
                 # upgrade pip
                 "pip install -U pip",
-                "pip install wheel",
-                # EasyBuild 3.x requires setuptools as runtime dependency
-                "pip install -U setuptools",
-                # stick to previous version of vsc-install to avoid requiring mock (which causes installation problems)
-                # stick to previous version of vsc-base to avoid requiring 'future' (irrelevant for EasyBuild)
-                # this is just a temporary measure, since vsc-install & vsc-base have been ingested for EasyBuild 4.x
-                "pip install 'vsc-install<0.11.4' 'vsc-base<2.9.0'",
                 "pip install easybuild",
             ])
 

test/framework/containers.py

@@ -141,9 +141,7 @@ def test_end2end_singularity_recipe_config(self):
             self.assertTrue(regex.search(txt), "Pattern '%s' found in: %s" % (regex.pattern, txt))
 
         pip_patterns = [
-            # EasyBuild and dependencies are installed with pip by default
-            "pip install -U setuptools",
-            "pip install.*vsc-base",
+            # EasyBuild is installed with pip by default
             "pip install easybuild",
         ]
         post_commands_patterns = [