projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wtsi/13093-crunch-dispatch-slurm-add-mem' refs #13093
[arvados.git]
/
services
/
dockercleaner
/
setup.py
diff --git
a/services/dockercleaner/setup.py
b/services/dockercleaner/setup.py
index 535650e3fa3f35bcbef48240727c7746e68eb7f8..6a6a96a0455eee17d5f5bb1b725b69f767805cae 100644
(file)
--- a/
services/dockercleaner/setup.py
+++ b/
services/dockercleaner/setup.py
@@
-1,4
+1,7
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
import os
import sys
import os
import sys
@@
-6,14
+9,18
@@
import setuptools.command.egg_info as egg_info_cmd
from setuptools import setup, find_packages
from setuptools import setup, find_packages
-try:
- import gittaggers
- tagger = gittaggers.EggInfoFromGit
-except ImportError:
- tagger = egg_info_cmd.egg_info
+tagger = egg_info_cmd.egg_info
+version = os.environ.get("ARVADOS_BUILDING_VERSION")
+if not version:
+ version = "0.1"
+ try:
+ import gittaggers
+ tagger = gittaggers.EggInfoFromGit
+ except ImportError:
+ pass
setup(name="arvados-docker-cleaner",
setup(name="arvados-docker-cleaner",
- version=
"0.1"
,
+ version=
version
,
description="Arvados Docker cleaner",
author="Arvados",
author_email="info@arvados.org",
description="Arvados Docker cleaner",
author="Arvados",
author_email="info@arvados.org",
@@
-29,6
+36,7
@@
setup(name="arvados-docker-cleaner",
],
install_requires=[
'docker-py==1.7.2',
],
install_requires=[
'docker-py==1.7.2',
+ 'setuptools',
],
tests_require=[
'pbr<1.7.0',
],
tests_require=[
'pbr<1.7.0',