easybuilders · akesandgren · Apr 22, 2019 · Feb 28, 2019 · Mar 1, 2019 · Mar 1, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -45,8 +45,6 @@ addons:
     packages:
       # for environment modules/Lmod
       - tcl8.5
-      # for EasyBuild
-      - python-setuptools
       # for GitPython, python-hglib
       - git
       - mercurial
@@ -115,6 +113,9 @@ script:
     - export PYTHONPATH=/tmp/$TRAVIS_JOB_ID/lib/python$TRAVIS_PYTHON_VERSION/site-packages
     # install easybuild-framework to unique temporary location using prepared sdist tarball
     - mkdir -p $PYTHONPATH; easy_install --prefix /tmp/$TRAVIS_JOB_ID $TRAVIS_BUILD_DIR/dist/easybuild-framework*tar.gz
+    # actively break "import setuptools", since EasyBuild should not have a runtime requirement on setuptools
+    - echo 'raise NotImplementedError("setuptools is not available")' > /tmp/$TRAVIS_JOB_ID/setuptools.py
+    - export PYTHONPATH=/tmp/$TRAVIS_JOB_ID:$PYTHONPATH
     # move outside of checkout of easybuild-framework repository,
     # to run tests on an *installed* version of the EasyBuild framework;
     # this is done to catch possible packaging issues

diff --git a/easybuild/__init__.py b/easybuild/__init__.py
@@ -28,5 +28,4 @@
 :author: Jens Timmerman (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/framework/easyblock.py b/easybuild/framework/easyblock.py
@@ -90,7 +90,7 @@
 from easybuild.tools.package.utilities import package
 from easybuild.tools.py2vs3 import extract_method_name, string_type
 from easybuild.tools.repository.repository import init_repository
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 from easybuild.tools.systemtools import det_parallelism, use_group
 from easybuild.tools.utilities import INDENT_4SPACES, get_class_for, quote_str, remove_unwanted_chars, trace_msg
 from easybuild.tools.version import this_is_easybuild, VERBOSE_VERSION, VERSION

diff --git a/easybuild/framework/easyconfig/easyconfig.py b/easybuild/framework/easyconfig/easyconfig.py
@@ -62,13 +62,13 @@
 from easybuild.tools.filetools import EASYBLOCK_CLASS_PREFIX
 from easybuild.tools.filetools import copy_file, decode_class_name, encode_class_name, read_file, write_file
 from easybuild.tools.hooks import PARSE, load_hooks, run_hook
-from easybuild.tools.module_naming_scheme import DEVEL_MODULE_SUFFIX
+from easybuild.tools.module_naming_scheme.mns import DEVEL_MODULE_SUFFIX
 from easybuild.tools.module_naming_scheme.utilities import avail_module_naming_schemes, det_full_ec_version
 from easybuild.tools.module_naming_scheme.utilities import det_hidden_modname, is_valid_module_name
 from easybuild.tools.modules import modules_tool
 from easybuild.tools.py2vs3 import OrderedDict, string_type
 from easybuild.tools.systemtools import check_os_dependency
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME, DUMMY_TOOLCHAIN_VERSION
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME, DUMMY_TOOLCHAIN_VERSION
 from easybuild.tools.toolchain.toolchain import TOOLCHAIN_CAPABILITIES, TOOLCHAIN_CAPABILITY_CUDA
 from easybuild.tools.toolchain.utilities import get_toolchain, search_toolchain
 from easybuild.tools.utilities import flatten, get_class_for, nub, quote_py_str, remove_unwanted_chars

diff --git a/easybuild/framework/easyconfig/tools.py b/easybuild/framework/easyconfig/tools.py
@@ -57,7 +57,7 @@
 from easybuild.tools.github import fetch_easyconfigs_from_pr, download_repo
 from easybuild.tools.multidiff import multidiff
 from easybuild.tools.py2vs3 import OrderedDict
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 from easybuild.tools.toolchain.utilities import search_toolchain
 from easybuild.tools.utilities import only_if_module_is_available, quote_str
 from easybuild.tools.version import VERSION as EASYBUILD_VERSION

diff --git a/easybuild/framework/easyconfig/tweak.py b/easybuild/framework/easyconfig/tweak.py
@@ -53,7 +53,7 @@
 from easybuild.tools.filetools import read_file, write_file
 from easybuild.tools.module_naming_scheme.utilities import det_full_ec_version
 from easybuild.tools.robot import resolve_dependencies, robot_find_easyconfig
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 from easybuild.tools.toolchain.toolchain import TOOLCHAIN_CAPABILITIES
 from easybuild.tools.utilities import flatten, nub, quote_str
 

diff --git a/easybuild/toolchains/__init__.py b/easybuild/toolchains/__init__.py
@@ -28,5 +28,4 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/toolchains/clanggcc.py b/easybuild/toolchains/clanggcc.py
@@ -30,11 +30,9 @@
 
 :author: Dmitri Gribenko (National Technical University of Ukraine "KPI")
 """
-
-import os
 from easybuild.toolchains.compiler.clang import Clang
 from easybuild.toolchains.compiler.gcc import Gcc
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 TC_CONSTANT_CLANGGCC = "ClangGCC"

diff --git a/easybuild/toolchains/compiler/__init__.py b/easybuild/toolchains/compiler/__init__.py
@@ -28,5 +28,4 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/toolchains/craycce.py b/easybuild/toolchains/craycce.py
@@ -31,7 +31,7 @@
 from easybuild.toolchains.compiler.craype import CrayPECray
 from easybuild.toolchains.linalg.libsci import LibSci
 from easybuild.toolchains.mpi.craympich import CrayMPICH
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class CrayCCE(CrayPECray, CrayMPICH, LibSci):

diff --git a/easybuild/toolchains/craygnu.py b/easybuild/toolchains/craygnu.py
@@ -31,7 +31,7 @@
 from easybuild.toolchains.compiler.craype import CrayPEGCC
 from easybuild.toolchains.linalg.libsci import LibSci
 from easybuild.toolchains.mpi.craympich import CrayMPICH
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class CrayGNU(CrayPEGCC, CrayMPICH, LibSci):

diff --git a/easybuild/toolchains/crayintel.py b/easybuild/toolchains/crayintel.py
@@ -31,7 +31,7 @@
 from easybuild.toolchains.compiler.craype import CrayPEIntel
 from easybuild.toolchains.linalg.libsci import LibSci
 from easybuild.toolchains.mpi.craympich import CrayMPICH
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class CrayIntel(CrayPEIntel, CrayMPICH, LibSci):

diff --git a/easybuild/toolchains/craypgi.py b/easybuild/toolchains/craypgi.py
@@ -28,7 +28,7 @@
 """
 from easybuild.toolchains.compiler.craype import CrayPEPGI
 from easybuild.toolchains.mpi.craympich import CrayMPICH
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 class CrayPGI(CrayPEPGI, CrayMPICH):
     """Compiler toolchain for Cray Programming Environment for Cray Compiling Environment (PGI) (PrgEnv-pgi)."""

diff --git a/easybuild/toolchains/fft/__init__.py b/easybuild/toolchains/fft/__init__.py
@@ -28,5 +28,4 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/toolchains/gcc.py b/easybuild/toolchains/gcc.py
@@ -29,7 +29,7 @@
 """
 
 from easybuild.toolchains.gcccore import GCCcore
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 class GccToolchain(GCCcore):
     """Simple toolchain with just the GCC compilers."""

diff --git a/easybuild/toolchains/gcccore.py b/easybuild/toolchains/gcccore.py
@@ -29,7 +29,8 @@
 """
 
 from easybuild.toolchains.compiler.gcc import Gcc
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
+
 
 class GCCcore(Gcc):
     """Compiler-only toolchain, including only GCC and binutils."""

diff --git a/easybuild/toolchains/gcccuda.py b/easybuild/toolchains/gcccuda.py
@@ -30,7 +30,6 @@
 
 from easybuild.toolchains.compiler.cuda import Cuda
 from easybuild.toolchains.gcc import GccToolchain
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class GccCUDA(GccToolchain, Cuda):

diff --git a/easybuild/toolchains/gnu.py b/easybuild/toolchains/gnu.py
@@ -29,7 +29,7 @@
 """
 
 from easybuild.toolchains.compiler.gcc import Gcc
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class GNU(Gcc):

diff --git a/easybuild/toolchains/iccifort.py b/easybuild/toolchains/iccifort.py
@@ -33,7 +33,7 @@
 
 from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort
 from easybuild.toolchains.gcccore import GCCcore
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class IccIfort(IntelIccIfort):

diff --git a/easybuild/toolchains/linalg/__init__.py b/easybuild/toolchains/linalg/__init__.py
@@ -28,5 +28,4 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/toolchains/mpi/__init__.py b/easybuild/toolchains/mpi/__init__.py
@@ -28,5 +28,4 @@
 :author: Stijn De Weirdt (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/toolchains/pgi.py b/easybuild/toolchains/pgi.py
@@ -33,7 +33,7 @@
 
 from easybuild.toolchains.compiler.pgi import Pgi
 from easybuild.toolchains.gcccore import GCCcore
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 
 
 class PgiToolchain(Pgi):

diff --git a/easybuild/tools/__init__.py b/easybuild/tools/__init__.py
@@ -32,5 +32,4 @@
 :author: Pieter De Baets (Ghent University)
 :author: Jens Timmerman (Ghent University)
 """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/tools/deprecated/__init__.py b/easybuild/tools/deprecated/__init__.py
@@ -1,36 +0,0 @@
-##
-# Copyright 2009-2019 Ghent University
-#
-# This file is part of EasyBuild,
-# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
-# with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
-# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
-# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
-#
-# https://github.com/easybuilders/easybuild
-#
-# EasyBuild is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation v2.
-#
-# EasyBuild is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
-##
-"""
-This declares the namespace for the tools.deprecated submodule of EasyBuild,
-which provides deprecated functionality.
-
-:author: Stijn De Weirdt (Ghent University)
-:author: Dries Verdegem (Ghent University)
-:author: Kenneth Hoste (Ghent University)
-:author: Pieter De Baets (Ghent University)
-:author: Jens Timmerman (Ghent University)
-"""
-import pkg_resources
-pkg_resources.declare_namespace(__name__)

diff --git a/easybuild/tools/docs.py b/easybuild/tools/docs.py
@@ -58,7 +58,7 @@
 from easybuild.tools.filetools import read_file
 from easybuild.tools.modules import modules_tool
 from easybuild.tools.py2vs3 import OrderedDict, ascii_lowercase
-from easybuild.tools.toolchain import DUMMY_TOOLCHAIN_NAME
+from easybuild.tools.toolchain.toolchain import DUMMY_TOOLCHAIN_NAME
 from easybuild.tools.toolchain.utilities import search_toolchain
 from easybuild.tools.utilities import INDENT_2SPACES, INDENT_4SPACES
 from easybuild.tools.utilities import import_available_modules, mk_rst_table, nub, quote_str

diff --git a/easybuild/tools/include.py b/easybuild/tools/include.py
@@ -57,15 +57,13 @@
 # body for __init__.py file in package directory, which takes care of making sure the package can be distributed
 # across multiple directories
 PKG_INIT_BODY = """
-import pkg_resources
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
 """
 
 # more extensive __init__.py specific to easybuild.easyblocks package;
 # this is required because of the way in which the easyblock Python modules are organised in the easybuild-easyblocks
 # repository, i.e. in first-letter subdirectories
 EASYBLOCKS_PKG_INIT_BODY = """
-import pkg_resources
 import pkgutil
 
 # extend path so Python finds our easyblocks in the subdirectories where they are located
@@ -75,8 +73,7 @@
 
 del l, subdir, subdirs
 
-# extend path so Python knows this is not the only place to look for modules in this package
-pkg_resources.declare_namespace(__name__)
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
 """
 
 
@@ -88,7 +85,7 @@ def create_pkg(path, pkg_init_body=None):
         if not os.path.exists(path):
             os.makedirs(path)
 
-        # put __init__.py files in place, with required pkg_resources.declare_namespace statement
+        # put __init__.py files in place, with required pkgutil.extend_path statement
         # note: can't use write_file, since that required build options to be initialised
         with open(init_path, 'w') as handle:
             if pkg_init_body is None:
@@ -182,7 +179,7 @@ def include_easyblocks(tmpdir, paths):
     import easybuild.easyblocks.generic
 
     # hard inject location to included (generic) easyblocks into Python search path
-    # only prepending to sys.path is not enough due to 'declare_namespace' in easybuild/easyblocks/__init__.py
+    # only prepending to sys.path is not enough due to 'pkgutil.extend_path' in easybuild/easyblocks/__init__.py
     new_path = os.path.join(easyblocks_path, 'easybuild', 'easyblocks')
     easybuild.easyblocks.__path__.insert(0, new_path)
     new_path = os.path.join(new_path, 'generic')
@@ -219,7 +216,7 @@ def include_module_naming_schemes(tmpdir, paths):
     sys.path.insert(0, mns_path)
 
     # hard inject location to included module naming schemes into Python search path
-    # only prepending to sys.path is not enough due to 'declare_namespace' in module_naming_scheme/__init__.py
+    # only prepending to sys.path is not enough due to 'pkgutil.extend_path' in module_naming_scheme/__init__.py
     new_path = os.path.join(mns_path, 'easybuild', 'tools', 'module_naming_scheme')
     easybuild.tools.module_naming_scheme.__path__.insert(0, new_path)
 
@@ -265,7 +262,7 @@ def include_toolchains(tmpdir, paths):
     sys.path.insert(0, toolchains_path)
 
     # reload toolchain modules and hard inject location to included toolchains into Python search path
-    # only prepending to sys.path is not enough due to 'declare_namespace' in toolchains/*/__init__.py
+    # only prepending to sys.path is not enough due to 'pkgutil.extend_path' in toolchains/*/__init__.py
     easybuild.toolchains.__path__.insert(0, os.path.join(toolchains_path, 'easybuild', 'toolchains'))
     for subpkg in toolchain_subpkgs:
         tcpkg = 'easybuild.toolchains.%s' % subpkg

diff --git a/easybuild/tools/job/__init__.py b/easybuild/tools/job/__init__.py
@@ -1,32 +0,0 @@
-##
-# Copyright 2011-2019 Ghent University
-#
-# This file is part of EasyBuild,
-# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
-# with support of Ghent University (http://ugent.be/hpc),
-# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
-# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
-# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
-#
-# https://github.com/easybuilders/easybuild
-#
-# EasyBuild is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation v2.
-#
-# EasyBuild is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
-##
-"""
-Declares easybuild.tools.job namespace, in an extendable way.
-
-:author: Jens Timmerman (Ghent University)
-:author: Kenneth Hoste (Ghent University)
-"""
-import pkg_resources
-pkg_resources.declare_namespace(__name__)

diff --git a/easybuild/tools/module_naming_scheme/__init__.py b/easybuild/tools/module_naming_scheme/__init__.py
@@ -28,12 +28,4 @@
 :author: Jens Timmerman (Ghent University)
 :author: Kenneth Hoste (Ghent University)
 """
-import pkg_resources
-
-# required for backward compatibility
-from easybuild.tools.module_naming_scheme.mns import ModuleNamingScheme
-
-pkg_resources.declare_namespace(__name__)
-
-# suffix for devel module filename
-DEVEL_MODULE_SUFFIX = '-easybuild-devel'
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/easybuild/tools/module_naming_scheme/categorized_mns.py b/easybuild/tools/module_naming_scheme/categorized_mns.py
@@ -32,7 +32,7 @@
 import os
 import re
 
-from easybuild.tools.module_naming_scheme import ModuleNamingScheme
+from easybuild.tools.module_naming_scheme.mns import ModuleNamingScheme
 from easybuild.tools.module_naming_scheme.utilities import det_full_ec_version
 
 class CategorizedModuleNamingScheme(ModuleNamingScheme):

diff --git a/easybuild/tools/module_naming_scheme/easybuild_mns.py b/easybuild/tools/module_naming_scheme/easybuild_mns.py
@@ -30,7 +30,7 @@
 
 import os
 
-from easybuild.tools.module_naming_scheme import ModuleNamingScheme
+from easybuild.tools.module_naming_scheme.mns import ModuleNamingScheme
 from easybuild.tools.module_naming_scheme.utilities import det_full_ec_version
 
 

diff --git a/easybuild/tools/module_naming_scheme/hierarchical_mns.py b/easybuild/tools/module_naming_scheme/hierarchical_mns.py
@@ -33,7 +33,7 @@
 import re
 
 from easybuild.tools.build_log import EasyBuildError
-from easybuild.tools.module_naming_scheme import ModuleNamingScheme
+from easybuild.tools.module_naming_scheme.mns import ModuleNamingScheme
 from easybuild.tools.module_naming_scheme.toolchain import det_toolchain_compilers, det_toolchain_mpi