From c7994dff23e899e9ca98bf891a1746a1db7390e7 Mon Sep 17 00:00:00 2001
From: Johannes Schumann <johannes.schumann@fau.de>
Date: Fri, 14 Feb 2020 21:44:37 +0100
Subject: [PATCH] Retreive image automatically while package installation
---
requirements.txt | 1 +
setup.py | 22 +++++++++++++---------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index cba8d88..2ec6e46 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
setuptools_scm
+spython
diff --git a/setup.py b/setup.py
index 5420dc9..3fbeff4 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),
--
GitLab