From d07fdc9d89369409ad8cb07612775d254847d527 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 5 Aug 2022 16:49:37 +0200 Subject: [PATCH 1/4] fixed fallback date --- DisplayCAL/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DisplayCAL/meta.py b/DisplayCAL/meta.py index 05e3ce89..34048b91 100644 --- a/DisplayCAL/meta.py +++ b/DisplayCAL/meta.py @@ -16,7 +16,7 @@ VERSION_STRING, ) except ImportError: - build = lastmod = "0000-00-00T00:00:00.0Z" + build = lastmod = "0000-00-00T00:00:00Z" VERSION = None VERSION_STRING = None From 3ba249fcd480d6ccbd8f8346ac06015232ea42b4 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 5 Aug 2022 17:07:39 +0200 Subject: [PATCH 2/4] updated str creation for lastmod --- setup.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index eb048e0f..1981aec8 100755 --- a/setup.py +++ b/setup.py @@ -486,11 +486,7 @@ def setup(): timestamp = time.gmtime(mtime) if timestamp: - lastmod = ( - strftime("%Y-%m-%dT%H:%M:%S", timestamp) - + str(round(mtime - int(mtime), 6))[1:] - + "Z" - ) + lastmod = f"{strftime('%Y-%m-%dT%H:%M:%S', timestamp)}Z" if not dry_run: print("Generating __version__.py") @@ -499,8 +495,8 @@ def setup(): versionpy.write("# generated by setup.py\n\n") build_time = time.time() versionpy.write( - "BUILD_DATE = %r\n" - % (strftime("%Y-%m-%dT%H:%M:%S", gmtime(build_time)) + "Z") + f"BUILD_DATE = " + f"{strftime('%Y-%m-%dT%H:%M:%S', gmtime(build_time))}Z\n" ) if lastmod: From bf37c5d02372ebd907850012c4b8d83e8b220f3a Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 5 Aug 2022 17:26:53 +0200 Subject: [PATCH 3/4] corrected build_time str --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 1981aec8..0e3b7ab3 100755 --- a/setup.py +++ b/setup.py @@ -496,7 +496,7 @@ def setup(): build_time = time.time() versionpy.write( f"BUILD_DATE = " - f"{strftime('%Y-%m-%dT%H:%M:%S', gmtime(build_time))}Z\n" + f"\"{strftime('%Y-%m-%dT%H:%M:%S', gmtime(build_time))}Z\"\n" ) if lastmod: From a83da0463b48f2904cb4aa367d2fb172998da644 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 6 Aug 2022 04:09:01 +0200 Subject: [PATCH 4/4] set lastmod to a valid date str --- DisplayCAL/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DisplayCAL/meta.py b/DisplayCAL/meta.py index 34048b91..00b9c82c 100644 --- a/DisplayCAL/meta.py +++ b/DisplayCAL/meta.py @@ -16,7 +16,7 @@ VERSION_STRING, ) except ImportError: - build = lastmod = "0000-00-00T00:00:00Z" + build = lastmod = "1970-01-01T00:00:00Z" VERSION = None VERSION_STRING = None