From b76c81d51db7ebb761b8dcedcf7c5d0b39260407 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 21 Dec 2017 11:55:10 -0500 Subject: [PATCH 1/3] added timestamp version format function --- setuptools_scm/version.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/setuptools_scm/version.py b/setuptools_scm/version.py index 6c45638d..e5d51380 100644 --- a/setuptools_scm/version.py +++ b/setuptools_scm/version.py @@ -144,6 +144,20 @@ def get_local_node_and_date(version): return version.format_choice("+{node}", "+{node}.d{time:%Y%m%d}") +def get_local_node_and_timestamp(version, fmt='%Y%m%d%H%M%S'): + if version.exact or version.node is None: + return version.format_choice("", + "+d{time:" + + "{fmt}".format(fmt=fmt) + + "}") + else: + return version.format_choice("+{node}", + "+{node}" + + ".d{time:" + + "{fmt}".format(fmt=fmt) + + "}") + + def get_local_dirty_tag(version): return version.format_choice('', '+dirty') From 04b9243b277d4985e111520b8097e51b8d7ec079 Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 21 Dec 2017 11:55:27 -0500 Subject: [PATCH 2/3] added entry point --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 5f06079b..abe5aca7 100644 --- a/setup.py +++ b/setup.py @@ -90,6 +90,7 @@ def parse(root): [setuptools_scm.local_scheme] node-and-date = setuptools_scm.version:get_local_node_and_date + node-and-timestamp = setuptools_scm.version:get_local_node_and_timestamp dirty-tag = setuptools_scm.version:get_local_dirty_tag """, classifiers=[ From 883f0f31eca4fa093a085352d25233d7b73b211c Mon Sep 17 00:00:00 2001 From: Nicholas Nadeau Date: Thu, 21 Dec 2017 12:07:51 -0500 Subject: [PATCH 3/3] fixing flake8 line length --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index abe5aca7..43270358 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,8 @@ def parse(root): [setuptools_scm.local_scheme] node-and-date = setuptools_scm.version:get_local_node_and_date - node-and-timestamp = setuptools_scm.version:get_local_node_and_timestamp + node-and-timestamp = \ + setuptools_scm.version:get_local_node_and_timestamp dirty-tag = setuptools_scm.version:get_local_dirty_tag """, classifiers=[