From e46a04251eba5d54dc8621f5abdc4319604615ac Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Wed, 13 Dec 2023 15:28:19 -0800 Subject: [PATCH 1/7] hotfix --- test/test_components.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_components.py b/test/test_components.py index bf7b14caf815c..72706f5734f68 100644 --- a/test/test_components.py +++ b/test/test_components.py @@ -2147,7 +2147,7 @@ def test_gallery(self): assert postprocessed_gallery == [ { "image": { - "path": "test/test_files/foo.png", + "path": str(Path("test/test_files/foo.png")), "orig_name": "foo.png", "mime_type": None, "size": None, @@ -2157,7 +2157,7 @@ def test_gallery(self): }, { "image": { - "path": "test/test_files/bar.png", + "path": str(Path("test/test_files/bar.png")), "orig_name": "bar.png", "mime_type": None, "size": None, @@ -2167,7 +2167,7 @@ def test_gallery(self): }, { "image": { - "path": "test/test_files/baz.png", + "path": str(Path("test/test_files/baz.png")), "orig_name": "baz.png", "mime_type": None, "size": None, @@ -2177,7 +2177,7 @@ def test_gallery(self): }, { "image": { - "path": "test/test_files/qux.png", + "path": str(Path("test/test_files/qux.png")), "orig_name": "qux.png", "mime_type": None, "size": None, From 7b0a4b28a0056a0cefcfbfe7798ca21c39ec3226 Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Wed, 13 Dec 2023 15:46:17 -0800 Subject: [PATCH 2/7] testing --- test/test_components.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_components.py b/test/test_components.py index 72706f5734f68..26a3d8d1d4a99 100644 --- a/test/test_components.py +++ b/test/test_components.py @@ -2144,10 +2144,11 @@ def test_gallery(self): Path("test/test_files/qux.png"), ] ).model_dump() + assert True assert postprocessed_gallery == [ { "image": { - "path": str(Path("test/test_files/foo.png")), + "path": os.path.join("test", "test_files", "foo.png"), "orig_name": "foo.png", "mime_type": None, "size": None, From 24c5b17eccdb0f7f3cb978fc4bcfea806083739c Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Wed, 13 Dec 2023 15:58:57 -0800 Subject: [PATCH 3/7] test --- test/test_components.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/test_components.py b/test/test_components.py index 26a3d8d1d4a99..9720c302d85aa 100644 --- a/test/test_components.py +++ b/test/test_components.py @@ -2138,13 +2138,14 @@ def test_gallery(self): postprocessed_gallery = gallery.postprocess( [ - ("test/test_files/foo.png", "foo_caption"), + (str(Path("test/test_files/foo.png")), "foo_caption"), (Path("test/test_files/bar.png"), "bar_caption"), - "test/test_files/baz.png", + str(Path("test/test_files/baz.png")), Path("test/test_files/qux.png"), ] ).model_dump() - assert True + + # Using os.path.join() below to make sure the test works on Windows assert postprocessed_gallery == [ { "image": { @@ -2158,7 +2159,7 @@ def test_gallery(self): }, { "image": { - "path": str(Path("test/test_files/bar.png")), + "path": os.path.join("test", "test_files", "bar.png"), "orig_name": "bar.png", "mime_type": None, "size": None, @@ -2168,7 +2169,7 @@ def test_gallery(self): }, { "image": { - "path": str(Path("test/test_files/baz.png")), + "path": os.path.join("test", "test_files", "baz.png"), "orig_name": "baz.png", "mime_type": None, "size": None, @@ -2178,7 +2179,7 @@ def test_gallery(self): }, { "image": { - "path": str(Path("test/test_files/qux.png")), + "path": os.path.join("test", "test_files", "qux.png"), "orig_name": "qux.png", "mime_type": None, "size": None, From 20de6504ea3668d21c5b4db3ee328353bc539976 Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Wed, 13 Dec 2023 23:05:01 -0800 Subject: [PATCH 4/7] fix --- test/test_components.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test_components.py b/test/test_components.py index 9720c302d85aa..5e13513e52567 100644 --- a/test/test_components.py +++ b/test/test_components.py @@ -2145,11 +2145,11 @@ def test_gallery(self): ] ).model_dump() - # Using os.path.join() below to make sure the test works on Windows + # Using str(Path(...)) to ensure that the test passes on all platforms assert postprocessed_gallery == [ { "image": { - "path": os.path.join("test", "test_files", "foo.png"), + "path": str(Path("test") / "test_files" / "foo.png"), "orig_name": "foo.png", "mime_type": None, "size": None, @@ -2159,7 +2159,7 @@ def test_gallery(self): }, { "image": { - "path": os.path.join("test", "test_files", "bar.png"), + "path": str(Path("test") / "test_files" / "bar.png"), "orig_name": "bar.png", "mime_type": None, "size": None, @@ -2169,7 +2169,7 @@ def test_gallery(self): }, { "image": { - "path": os.path.join("test", "test_files", "baz.png"), + "path": str(Path("test") / "test_files" / "baz.png"), "orig_name": "baz.png", "mime_type": None, "size": None, @@ -2179,7 +2179,7 @@ def test_gallery(self): }, { "image": { - "path": os.path.join("test", "test_files", "qux.png"), + "path": str(Path("test") / "test_files" / "qux.png"), "orig_name": "qux.png", "mime_type": None, "size": None, From 16aeed01fbd4926e554c96cb86ea092734171e52 Mon Sep 17 00:00:00 2001 From: Abubakar Abid Date: Wed, 13 Dec 2023 23:19:13 -0800 Subject: [PATCH 5/7] fix --- gradio/components/file_explorer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradio/components/file_explorer.py b/gradio/components/file_explorer.py index bbdb65c8c413c..7ed5909fea938 100644 --- a/gradio/components/file_explorer.py +++ b/gradio/components/file_explorer.py @@ -170,7 +170,7 @@ def expand_braces(text, seen=None): def make_tree(files): tree = [] for file in files: - parts = file.split("/") + parts = file.split(os.path.sep) make_node(parts, tree) return tree From fbfe1cb614098558583b9095770bf429e7b46943 Mon Sep 17 00:00:00 2001 From: gradio-pr-bot Date: Thu, 14 Dec 2023 07:20:02 +0000 Subject: [PATCH 6/7] add changeset --- .changeset/vast-kings-deny.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/vast-kings-deny.md diff --git a/.changeset/vast-kings-deny.md b/.changeset/vast-kings-deny.md new file mode 100644 index 0000000000000..f5aa4e731fdf2 --- /dev/null +++ b/.changeset/vast-kings-deny.md @@ -0,0 +1,5 @@ +--- +"gradio": minor +--- + +feat:Fix backend tests on Windows From 2068f5e67227a1db1545de97f97df371904d35d5 Mon Sep 17 00:00:00 2001 From: gradio-pr-bot Date: Thu, 14 Dec 2023 07:21:13 +0000 Subject: [PATCH 7/7] add changeset --- .changeset/vast-kings-deny.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/vast-kings-deny.md b/.changeset/vast-kings-deny.md index f5aa4e731fdf2..a2a874a499d6c 100644 --- a/.changeset/vast-kings-deny.md +++ b/.changeset/vast-kings-deny.md @@ -1,5 +1,5 @@ --- -"gradio": minor +"gradio": patch --- feat:Fix backend tests on Windows