Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 45 additions & 44 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions renku/core/commands/cwl_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import os
import shutil
import sys
from urllib.parse import unquote

import click

Expand Down Expand Up @@ -71,8 +72,8 @@ def addLocation(d):

def remove_prefix(location, prefix="file://"):
if location.startswith(prefix):
return location[len(prefix) :]
return location
return unquote(location[len(prefix) :])
return unquote(location)

locations = {remove_prefix(output["location"]) for output in outputs.values()}
# make sure to not move an output if it's containing directory gets moved
Expand Down
4 changes: 3 additions & 1 deletion renku/core/management/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
from renku.core.models.refs import LinkReference
from renku.core.models.workflow.dependency_graph import DependencyGraph
from renku.core.utils.migrate import MigrationType
from renku.core.utils.scm import git_unicode_unescape

from .git import GitCore

Expand Down Expand Up @@ -319,7 +320,8 @@ def process_commit(self, commit=None, path=None):

if not path:
# search for activities a file could have been a part of
activities = self.activities_for_paths(commit.stats.files.keys(), file_commit=commit, revision="HEAD")
paths = [git_unicode_unescape(p) for p in commit.stats.files.keys()]
activities = self.activities_for_paths(paths, file_commit=commit, revision="HEAD")
if len(activities) > 1:
raise errors.CommitProcessingError(
"Found multiple activities that produced the same entity at commit {}".format(commit)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def run(self):
"click>=7.0,<=7.1.2",
"cryptography>=3.4.1,<3.5",
"cwlgen>=0.4.0,<=0.4.2",
"cwltool>=3.0.20210124104916,<3.1",
"cwltool>=3.0.20210319143721,<3.1",
"environ_config>=18.2.0,<=20.1.0",
"filelock>=3.0.0,<=3.0.12",
"gitpython==3.1.12",
Expand Down
18 changes: 15 additions & 3 deletions tests/cli/test_rerun.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,25 @@
from renku.cli import cli


def test_simple_rerun(runner, project, run, no_lfs_warning):
@pytest.mark.parametrize(
"source,selected",
[
("coffee-orders-☕-by-locationtest.csv", "😍works.txt"),
("source.txt", "selected.txt"),
("test-愛", "成功"),
("그래프", "성공"),
("يحاول", "نجاح.txt"),
("график.txt", "успех.txt"),
("𒁃.c", "𒁏.txt"),
],
)
def test_simple_rerun(runner, project, run, no_lfs_warning, source, selected):
"""Test simple file recreation."""
greetings = {"hello", "hola", "ahoj"}

cwd = Path(project)
source = cwd / "source.txt"
selected = cwd / "selected.txt"
source = cwd / source
selected = cwd / selected

repo = git.Repo(project)

Expand Down