Merge pull request #2825 from SwissDataScienceCenter/release/v1.2.1

chore: release 1.2.1

Author: Panaetius

CHANGES.rst

@@ -18,6 +18,16 @@
 Changes
 =======
 
+`1.2.1 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.2.0...v1.2.1>`__ (2022-04-11)
+-------------------------------------------------------------------------------------------------------
+
+Bug Fixes
+~~~~~~~~~
+
+-  **core:** fix Plan.invalidated_at datetime not being timezone aware
+   (`#2823 <https://github.com/SwissDataScienceCenter/renku-python/issues/2823>`__)
+   (`df82f9f <https://github.com/SwissDataScienceCenter/renku-python/commit/df82f9fd8c481f6a6c177d1bdcd08484dbd46e79>`__)
+
 `1.2.0 <https://github.com/SwissDataScienceCenter/renku-python/compare/v1.1.4...v1.2.0>`__ (2022-04-08)
 -------------------------------------------------------------------------------------------------------
 

helm-chart/renku-core/Chart.yaml

@@ -3,4 +3,4 @@ appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: renku-core
 icon: https://avatars0.githubusercontent.com/u/53332360?s=400&u=a4311d22842343604ef61a8c8a1e5793209a67e9&v=4
-version: 1.2.0
+version: 1.2.1

helm-chart/renku-core/values.yaml

@@ -109,7 +109,7 @@ versions:
     fullnameOverride: ""
     image:
       repository: renku/renku-core
-      tag: "v1.2.0"
+      tag: "v1.2.1"
       pullPolicy: IfNotPresent
   v8:
     name: v8

renku/command/checks/validate_shacl.py

@@ -25,7 +25,7 @@
 from renku.command.schema.project import ProjectSchema
 from renku.core.interface.dataset_gateway import IDatasetGateway
 from renku.core.util.shacl import validate_graph
-from renku.domain_model.jsonld import NoDatesSafeLoader
+from renku.core.util.yaml import NoDatesSafeLoader
 
 
 def _shacl_graph_to_string(graph):

renku/command/schema/plan.py

@@ -17,6 +17,8 @@
 # limitations under the License.
 """Represent run templates."""
 
+from datetime import timezone
+
 import marshmallow
 
 from renku.command.schema.calamus import JsonLDSchema, Nested, fields, prov, renku, schema
@@ -49,3 +51,14 @@ class Meta:
     outputs = Nested(renku.hasOutputs, CommandOutputSchema, many=True, missing=None)
     parameters = Nested(renku.hasArguments, CommandParameterSchema, many=True, missing=None)
     success_codes = fields.List(renku.successCodes, fields.Integer(), missing=[0])
+
+    @marshmallow.pre_dump
+    def _pre_dump(self, in_data, **kwargs):
+        """Fix data on dumping."""
+        if in_data.invalidated_at is not None and in_data.invalidated_at.tzinfo is None:
+            # NOTE: There was a bug that caused invalidated_at to be set without timezone (as UTC time)
+            # so we patch in the timezone here
+            in_data.unfreeze()
+            in_data.invalidated_at = in_data.invalidated_at.replace(microsecond=0).astimezone(timezone.utc)
+            in_data.freeze()
+        return in_data

renku/command/workflow.py

@@ -21,7 +21,6 @@
 import itertools
 import re
 from collections import defaultdict
-from datetime import datetime
 from functools import reduce
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union, cast
@@ -133,7 +132,7 @@ def _remove_workflow(name: str, force: bool, plan_gateway: IPlanGateway):
 
     plan = plan or workflows[name]
     plan.unfreeze()
-    plan.invalidated_at = datetime.utcnow()
+    plan.invalidated_at = local_now()
     plan.freeze()
 
 

renku/core/migration/m_0003__1_jsonld.py

@@ -30,7 +30,7 @@
     get_pre_0_3_4_datasets_metadata,
     is_using_temporary_datasets_path,
 )
-from renku.domain_model.jsonld import read_yaml, write_yaml
+from renku.core.util.yaml import read_yaml, write_yaml
 
 
 def migrate(migration_context):

renku/core/migration/m_0009__new_metadata_storage.py

@@ -48,8 +48,8 @@
 )
 from renku.core.migration.utils.conversion import convert_dataset
 from renku.core.util import communication
+from renku.core.util.yaml import load_yaml
 from renku.domain_model.entity import Collection, Entity
-from renku.domain_model.jsonld import load_yaml
 from renku.domain_model.project import Project
 from renku.domain_model.provenance.activity import Activity, Association, Generation, Usage
 from renku.domain_model.provenance.agent import Person, SoftwareAgent

renku/core/migration/models/v3.py

@@ -25,8 +25,8 @@
 from renku.core.migration.models.v9 import Person as OldPerson
 from renku.core.migration.models.v9 import generate_project_id, wfprov
 from renku.core.migration.utils import OLD_METADATA_PATH, generate_dataset_tag_id, generate_url_id, get_datasets_path
+from renku.core.util import yaml
 from renku.core.util.urls import get_host
-from renku.domain_model import jsonld
 
 
 class Base:
@@ -86,7 +86,7 @@ class Project(Base):
     @classmethod
     def from_yaml(cls, path, client):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = ProjectSchemaV3().load(data)
 
         if not self.creator:
@@ -107,7 +107,7 @@ def to_yaml(self, path):
         self.agent_version = __version__
 
         data = ProjectSchemaV3().dump(self)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class Collection(Base):
@@ -166,7 +166,7 @@ class Dataset(Base):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = DatasetSchemaV3(client=client, commit=commit).load(data)
         self._metadata_path = path
         return self
@@ -175,7 +175,7 @@ def to_yaml(self, path=None):
         """Write content to a YAML file."""
         data = DatasetSchemaV3().dump(self)
         path = path or self._metadata_path or os.path.join(self.path, OLD_METADATA_PATH)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class PersonSchemaV3(JsonLDSchema):

renku/core/migration/models/v7.py

@@ -23,7 +23,7 @@
 
 from renku.command.schema.calamus import fields, prov, renku, schema
 from renku.core.migration.utils import OLD_METADATA_PATH, get_datasets_path
-from renku.domain_model import jsonld
+from renku.core.util import yaml
 
 from .v3 import Base, DatasetFileSchemaV3, DatasetSchemaV3, UrlSchemaV3
 
@@ -34,7 +34,7 @@ class Dataset(Base):
     @classmethod
     def from_yaml(cls, path, client=None, commit=None):
         """Read content from YAML file."""
-        data = jsonld.read_yaml(path)
+        data = yaml.read_yaml(path)
         self = DatasetSchemaV7(client=client, commit=commit).load(data)
         self._metadata_path = path
         return self
@@ -43,7 +43,7 @@ def to_yaml(self, path=None):
         """Write content to a YAML file."""
         data = DatasetSchemaV7().dump(self)
         path = path or self._metadata_path or os.path.join(self.path, OLD_METADATA_PATH)
-        jsonld.write_yaml(path=path, data=data)
+        yaml.write_yaml(path=path, data=data)
 
 
 class DatasetFileSchemaV7(DatasetFileSchemaV3):