diff --git a/requirements.txt b/requirements.txt index cba8d8860740c8cc71720b2c8640c6b4d47ca4e2..2ec6e46535c975cbc0f69d0e6c3f460cf0ebb1c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ setuptools_scm +spython diff --git a/setup.py b/setup.py index 5420dc9d7498377ab8ce532e4c29a6146390e1aa..3fbeff4df360e61cff9fcfaac36bec8935509fc9 100644 --- a/setup.py +++ b/setup.py @@ -6,11 +6,6 @@ KM3BUU setup script. """ -from setuptools import setup, find_packages -from setuptools.command.install import install -from setuptools.command.develop import develop -from setuptools.command.egg_info import egg_info - PACKAGE_NAME = 'km3buu' URL = 'https://git.km3net.de/simulation/km3buu' DESCRIPTION = 'GiBUU tools for KM3NeT' @@ -18,13 +13,20 @@ __author__ = 'Johannes Schumann' __email__ = 'jschumann@km3net.de' import os +from setuptools import setup, find_packages +from setuptools.command.install import install +from setuptools.command.develop import develop +from setuptools.command.egg_info import egg_info +from spython.main import Client with open('requirements.txt') as fobj: REQUIREMENTS = [l.strip() for l in fobj.readlines()] def _build_image(): - os.system('make buildremote') + docker_url = "docker://docker.km3net.de/simulation/km3buu" + image_name = "GiBUU.simg" + Client.pull(docker_url, name=image_name) class CustomInstallCmd(install): @@ -54,9 +56,11 @@ setup( packages=find_packages(), include_package_data=True, platforms='any', - cmdclass={'install': CustomInstallCmd, - 'develop': CustomDevelopCmd, - 'egg_info': CustomEggInfoCmd}, + cmdclass={ + 'install': CustomInstallCmd, + 'develop': CustomDevelopCmd, + 'egg_info': CustomEggInfoCmd + }, setup_requires=['setuptools_scm'], use_scm_version={ 'write_to': '{}/version.txt'.format(PACKAGE_NAME),