From 3c3188ee6dc693e1c88218de8c0ea0c8cbe4f5ca Mon Sep 17 00:00:00 2001 From: Ben Souchet Date: Thu, 12 Dec 2024 18:48:20 +0100 Subject: [PATCH 1/2] Bump version to 4.0.14 --- src/quadpype/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/quadpype/version.py b/src/quadpype/version.py index 68f57f3883..951a2ce6e0 100644 --- a/src/quadpype/version.py +++ b/src/quadpype/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- """File declaring QuadPype version.""" -__version__ = "4.0.13" +__version__ = "4.0.14" From 712e992be0813e267dda1e87236b202e396310db Mon Sep 17 00:00:00 2001 From: Ben Souchet Date: Fri, 13 Dec 2024 10:45:17 +0100 Subject: [PATCH 2/2] Revert undesired change in vendor file --- .../google/protobuf/internal/well_known_types.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/quadpype/hosts/nuke/vendor/google/protobuf/internal/well_known_types.py b/src/quadpype/hosts/nuke/vendor/google/protobuf/internal/well_known_types.py index 5c8fc6db11..b581ab750a 100644 --- a/src/quadpype/hosts/nuke/vendor/google/protobuf/internal/well_known_types.py +++ b/src/quadpype/hosts/nuke/vendor/google/protobuf/internal/well_known_types.py @@ -42,8 +42,7 @@ import calendar import collections.abc - -from datetime import datetime, timezone, timedelta +import datetime from google.protobuf.descriptor import FieldDescriptor @@ -161,8 +160,8 @@ def FromJsonString(self, value): raise ValueError( 'time data \'{0}\' does not match format \'%Y-%m-%dT%H:%M:%S\', ' 'lowercase \'t\' is not accepted'.format(second_value)) - date_object = datetime.strptime(second_value, _TIMESTAMPFOMAT) - td = date_object - datetime(1970, 1, 1) + date_object = datetime.datetime.strptime(second_value, _TIMESTAMPFOMAT) + td = date_object - datetime.datetime(1970, 1, 1) seconds = td.seconds + td.days * _SECONDS_PER_DAY if len(nano_value) > 9: raise ValueError( @@ -193,7 +192,7 @@ def FromJsonString(self, value): def GetCurrentTime(self): """Get the current UTC into Timestamp.""" - self.FromDatetime(datetime.now(timezone.utc)) + self.FromDatetime(datetime.datetime.utcnow()) def ToNanoseconds(self): """Converts Timestamp to nanoseconds since epoch.""" @@ -245,7 +244,7 @@ def ToDatetime(self, tzinfo=None): Otherwise, returns a timezone-aware datetime in the input timezone. """ - delta = timedelta( + delta = datetime.timedelta( seconds=self.seconds, microseconds=_RoundTowardZero(self.nanos, _NANOS_PER_MICROSECOND)) if tzinfo is None: @@ -383,7 +382,7 @@ def FromSeconds(self, seconds): def ToTimedelta(self): """Converts Duration to timedelta.""" - return timedelta( + return datetime.timedelta( seconds=self.seconds, microseconds=_RoundTowardZero( self.nanos, _NANOS_PER_MICROSECOND))