diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index cc75bf017b..e7b5e2b50d 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -133,7 +133,7 @@ jobs: run: | # make sure there are no (top-level) "import setuptools" or "import pkg_resources" statements, # since EasyBuild should not have a runtime requirement on setuptools - SETUPTOOLS_IMPORTS=$(egrep -RI '^(from|import)[ ]*pkg_resources|^(from|import)[ ]*setuptools' * || true) + SETUPTOOLS_IMPORTS=$(egrep --exclude setup.py -RI '^(from|import)[ ]*pkg_resources|^(from|import)[ ]*setuptools' * || true) test "x$SETUPTOOLS_IMPORTS" = "x" || (echo "Found setuptools and/or pkg_resources imports in easybuild/:\n${SETUPTOOLS_IMPORTS}" && exit 1) - name: install sources diff --git a/setup.py b/setup.py index f9ba00afbb..18d3cddc17 100644 --- a/setup.py +++ b/setup.py @@ -24,16 +24,17 @@ ## """ This script can be used to install easybuild-framework, e.g. using: - easy_install --user . -or - python setup.py --prefix=$HOME/easybuild + python setup.py install --prefix=$HOME/easybuild @author: Kenneth Hoste (Ghent University) """ import glob import os -from distutils import log -from distutils.core import setup +import logging +try: + from distutils.core import setup +except ImportError: + from setuptools import setup from easybuild.tools.version import VERSION @@ -45,8 +46,10 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -# log levels: 0 = WARN (default), 1 = INFO, 2 = DEBUG -log.set_verbosity(1) +log = logging.getLogger("EasyBuild") + +# log levels: NOTSET (default), DEBUG, INFO, WARNING, ERROR, CRITICAL +log.setLevel(logging.INFO) log.info("Installing version %s (API version %s)" % (VERSION, API_VERSION))