Skip to content

Commit

Permalink
Fix rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
freddyaboulton committed Oct 12, 2022
1 parent 0dd5d09 commit a1a36fb
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion gradio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
from gradio.layouts import Accordion, Box, Column, Group, Row, Tab, TabItem, Tabs
from gradio.mix import Parallel, Series
from gradio.routes import mount_gradio_app
from gradio.stop_button import StopButton
from gradio.templates import (
Files,
Highlight,
Expand Down
2 changes: 1 addition & 1 deletion gradio/blocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
document_component_api,
set_documentation_group,
)
from gradio.exceptions import DuplicateBlockError, GradioStopIteration
from gradio.exceptions import DuplicateBlockError
from gradio.utils import component_or_layout_class, delete_none

set_documentation_group("blocks")
Expand Down
10 changes: 5 additions & 5 deletions gradio/test_data/blocks_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"api_name": None,
"scroll_to_output": False,
"show_progress": True,
"cancels": []
"cancels": [],
},
{
"targets": [13],
Expand All @@ -455,7 +455,7 @@
"api_name": None,
"scroll_to_output": False,
"show_progress": True,
"cancels": []
"cancels": [],
},
{
"targets": [],
Expand All @@ -468,7 +468,7 @@
"api_name": None,
"scroll_to_output": False,
"show_progress": True,
"cancels": []
"cancels": [],
},
],
}
Expand Down Expand Up @@ -645,7 +645,7 @@
"api_name": None,
"scroll_to_output": False,
"show_progress": True,
"cancels": []
"cancels": [],
},
{
"targets": [13],
Expand All @@ -655,7 +655,7 @@
"api_name": None,
"scroll_to_output": False,
"show_progress": True,
"cancels": []
"cancels": [],
},
],
}
2 changes: 1 addition & 1 deletion test/test_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ async def test_queue_join_routes_sets_url_if_none_set(mock_get_url):
if msg["msg"] == "send_data":
await ws.send(json.dumps({"data": ["foo"], "fn_index": 0}))
if msg["msg"] == "send_hash":
await ws.send(json.dumps({"fn_index": 0, "session_hash": 'shdce'}))
await ws.send(json.dumps({"fn_index": 0, "session_hash": "shdce"}))
completed = msg["msg"] == "process_completed"
assert io._queue.server_path == "foo_url"

Expand Down

0 comments on commit a1a36fb

Please sign in to comment.