diff --git a/README.md b/README.md index 18adca12366c16cca27370f8217e25c8a126623c..c63be394c9e4c31dbb6fa68e4ddd96a6c9161bf7 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ This repository is part of the Neurorobotics Platform software Copyright (C) Human Brain Project -https://neurorobotics.ai +https://neurorobotics.net The Human Brain Project is a European Commission funded project in the frame of the [Horizon2020 FET Flagship plan](http://ec.europa.eu/programmes/horizon2020/en/h2020-section/fet-flagships). +This work has received funding from the European Union’s Horizon 2020 Framework Programme for Research and Innovation under the Specific Grant Agreement No. 720270 (Human Brain Project SGA1), and the Specific Grant Agreement No. 785907 (Human Brain Project SGA2), and under the Specific Grant Agreement No. 945539 (Human Brain Project SGA3). + You are free to clone this repository and amend its code with respect to the license that you find in the root folder. diff --git a/hbp_nrp_distributed_nest/setup.py b/hbp_nrp_distributed_nest/setup.py index 406149371e8cd33f9cef17036cbf4496b4ef68fc..b1b9b63b35207bb8ea8817d967d56f6a8eb3e670 100644 --- a/hbp_nrp_distributed_nest/setup.py +++ b/hbp_nrp_distributed_nest/setup.py @@ -1,56 +1,14 @@ '''setup.py''' -from builtins import next from setuptools import setup import hbp_nrp_distributed_nest -import pip -from optparse import Option # pylint:disable=deprecated-module -options = Option('--workaround') -options.skip_requirements_regex = None reqs_file = './requirements.txt' -pip_version_major = int(pip.__version__.split('.')[0]) -# Hack for old pip versions -if pip_version_major == 1: - # Versions 1.x rely on pip.req.parse_requirements - # but don't require a "session" parameter - from pip.req import parse_requirements # pylint:disable=no-name-in-module, import-error - install_reqs = parse_requirements(reqs_file, options=options) - reqs = [str(ir.req) for ir in install_reqs] -elif 10 > pip_version_major > 1: - # Versions greater than 1.x but smaller than 10.x rely on pip.req.parse_requirements - # and requires a "session" parameter - from pip.req import parse_requirements # pylint:disable=no-name-in-module, import-error - from pip.download import PipSession # pylint:disable=no-name-in-module, import-error - options.isolated_mode = False - install_reqs = parse_requirements( # pylint:disable=unexpected-keyword-arg - reqs_file, - session=PipSession, - options=options - ) - reqs = [str(ir.req) for ir in install_reqs] -elif pip_version_major >= 10: - # Versions greater or equal to 10.x don't rely on pip.req.parse_requirements - install_reqs = list(val.strip() for val in open(reqs_file)) - reqs = install_reqs - -# ensure we install numpy before the main list of requirements, ignore -# failures if numpy/cython are not requirements and just proceed (future proof) -try: - cython_req = next(r for r in reqs if r.startswith('cython')) - numpy_req = next(r for r in reqs if r.startswith('numpy')) - if pip.__version__.startswith('10.'): - import subprocess - subprocess.check_call( - ["python", '-m', 'pip', 'install', "--no-clean", "--user", cython_req, numpy_req] - ) - else: - pip.main(['install', '--no-clean', cython_req, numpy_req]) # pylint:disable=no-member -# pylint: disable=bare-except -except: - pass +# Get the list of requirements +install_reqs = list(val.strip() for val in open(reqs_file)) +reqs = install_reqs config = { 'description': 'Distributed Nest interface support for CLE/ExDBackend for HBP SP10',