Skip to content

Commit 310b7de

Browse files
authored
chore: bump pyshacl to >=0.20.0 (#3583)
1 parent 9ee3176 commit 310b7de

File tree

6 files changed

+566
-506
lines changed

6 files changed

+566
-506
lines changed

poetry.lock

Lines changed: 561 additions & 496 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ psutil = ">=5.4.7,<5.9.2"
8383
pydantic = "==1.10.7"
8484
pyjwt = ">=2.1.0,<2.5.0"
8585
pyld = "==2.0.3"
86-
pyshacl = ">=0.17.2,<0.19.2"
86+
pyshacl = ">=0.20.0,<0.24.0"
8787
python-dateutil = "<2.8.3,>=2.6.1"
8888
python-gitlab = ">=2.10.1,<3.8.2"
8989
pyyaml = "<6.1.0,>=5.4"
@@ -149,7 +149,7 @@ pytest-flake8 = ">=1.0.6,<1.1.2"
149149
pytest-lazy-fixture = ">=0.6.3,<0.7.0"
150150
pytest-mock = ">=3.2.0,<3.11.0"
151151
pytest-pep8 = "==1.0.6"
152-
pytest-recording = "==0.12.2"
152+
pytest-recording = "==0.13.0"
153153
pytest-timeout = "==2.1.0"
154154
pytest-xdist = ">=1.34.0,<3.4.0"
155155
responses = ">=0.22.0,<0.24.0"

renku/core/migration/models/v9.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,11 +1390,6 @@ def full_path(self):
13901390
path = project_context.path / self.path
13911391
return Path(os.path.abspath(path))
13921392

1393-
@property
1394-
def filesize(self):
1395-
"""Return file size."""
1396-
return None if self.filesize is None else self.filesize
1397-
13981393
def __attrs_post_init__(self):
13991394
"""Set the property "name" after initialization."""
14001395
super().__attrs_post_init__()

renku/infrastructure/git_merger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def _setup_worktrees(self, repository):
126126

127127
def merge_objects(self, local: Persistent, remote: Persistent, base: Optional[Persistent]) -> Persistent:
128128
"""Merge two database objects."""
129-
if type(local) != type(remote):
129+
if not isinstance(local, type(remote)):
130130
raise errors.MetadataMergeError(f"Cannot merge {local} and {remote}: disparate types.")
131131
if isinstance(local, (BTree, Index, Bucket)):
132132
return self.merge_btrees(local, remote)

renku/ui/cli/utils/click.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def __init__(self, *args, **kwargs):
9393
self.mutually_exclusive_names = []
9494

9595
for mutex in mutually_exclusive:
96-
if type(mutex) == tuple:
96+
if isinstance(mutex, tuple):
9797
self.mutually_exclusive.add(mutex[0])
9898
self.mutually_exclusive_names.append(mutex[1])
9999
else:

tests/cli/test_workflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ def test_workflow_execute_command(
640640
workflow_name = workflows[0][0]
641641

642642
def _flatten_dict(obj, key_string=""):
643-
if type(obj) == dict:
643+
if isinstance(obj, dict):
644644
key_string = key_string + "." if key_string else key_string
645645
for key in obj:
646646
yield from _flatten_dict(obj[key], key_string + str(key))

0 commit comments

Comments
 (0)