From 228b24697f28441133c5d53cacf7bfe034ee5f56 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 17 Nov 2020 09:52:53 -0500 Subject: [PATCH] 17012: remove old gittaggers.py files. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- sdk/cwl/gittaggers.py | 48 -------------------------- sdk/python/gittaggers.py | 29 ---------------- services/dockercleaner/gittaggers.py | 1 - services/fuse/gittaggers.py | 1 - tools/crunchstat-summary/gittaggers.py | 1 - 5 files changed, 80 deletions(-) delete mode 100644 sdk/cwl/gittaggers.py delete mode 100644 sdk/python/gittaggers.py delete mode 120000 services/dockercleaner/gittaggers.py delete mode 120000 services/fuse/gittaggers.py delete mode 120000 tools/crunchstat-summary/gittaggers.py diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py deleted file mode 100644 index d6a4c24a78..0000000000 --- a/sdk/cwl/gittaggers.py +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -from builtins import str -from builtins import next - -from setuptools.command.egg_info import egg_info -import subprocess -import time -import os - -SETUP_DIR = os.path.dirname(__file__) or '.' - -def choose_version_from(): - sdk_ts = subprocess.check_output( - ['git', 'log', '--first-parent', '--max-count=1', - '--format=format:%ct', os.path.join(SETUP_DIR, "../python")]).strip() - cwl_ts = subprocess.check_output( - ['git', 'log', '--first-parent', '--max-count=1', - '--format=format:%ct', SETUP_DIR]).strip() - if int(sdk_ts) > int(cwl_ts): - getver = os.path.join(SETUP_DIR, "../python") - else: - getver = SETUP_DIR - return getver - -class EggInfoFromGit(egg_info): - """Tag the build with git commit timestamp. - - If a build tag has already been set (e.g., "egg_info -b", building - from source package), leave it alone. - """ - def git_latest_tag(self): - gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: [int(u) for u in s.split(b'.')],reverse=True) - return str(next(iter(gittags)).decode('utf-8')) - - def git_timestamp_tag(self): - gitinfo = subprocess.check_output( - ['git', 'log', '--first-parent', '--max-count=1', - '--format=format:%ct', choose_version_from()]).strip() - return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))) - - def tags(self): - if self.tag_build is None: - self.tag_build = self.git_latest_tag() + self.git_timestamp_tag() - return egg_info.tags(self) diff --git a/sdk/python/gittaggers.py b/sdk/python/gittaggers.py deleted file mode 100644 index f3278fcc1d..0000000000 --- a/sdk/python/gittaggers.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -from setuptools.command.egg_info import egg_info -import subprocess -import time - -class EggInfoFromGit(egg_info): - """Tag the build with git commit timestamp. - - If a build tag has already been set (e.g., "egg_info -b", building - from source package), leave it alone. - """ - def git_latest_tag(self): - gittags = subprocess.check_output(['git', 'tag', '-l']).split() - gittags.sort(key=lambda s: [int(u) for u in s.split(b'.')],reverse=True) - return str(next(iter(gittags)).decode('utf-8')) - - def git_timestamp_tag(self): - gitinfo = subprocess.check_output( - ['git', 'log', '--first-parent', '--max-count=1', - '--format=format:%ct', '.']).strip() - return time.strftime('.%Y%m%d%H%M%S', time.gmtime(int(gitinfo))) - - def tags(self): - if self.tag_build is None: - self.tag_build = self.git_latest_tag()+self.git_timestamp_tag() - return egg_info.tags(self) diff --git a/services/dockercleaner/gittaggers.py b/services/dockercleaner/gittaggers.py deleted file mode 120000 index a9ad861d81..0000000000 --- a/services/dockercleaner/gittaggers.py +++ /dev/null @@ -1 +0,0 @@ -../../sdk/python/gittaggers.py \ No newline at end of file diff --git a/services/fuse/gittaggers.py b/services/fuse/gittaggers.py deleted file mode 120000 index a9ad861d81..0000000000 --- a/services/fuse/gittaggers.py +++ /dev/null @@ -1 +0,0 @@ -../../sdk/python/gittaggers.py \ No newline at end of file diff --git a/tools/crunchstat-summary/gittaggers.py b/tools/crunchstat-summary/gittaggers.py deleted file mode 120000 index a9ad861d81..0000000000 --- a/tools/crunchstat-summary/gittaggers.py +++ /dev/null @@ -1 +0,0 @@ -../../sdk/python/gittaggers.py \ No newline at end of file -- 2.30.2