Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Transfer TUI Code to Dev Branch #1605

Merged
merged 20 commits into from
Feb 6, 2020
Merged

Transfer TUI Code to Dev Branch #1605

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
40087ac
Update worker thread for server creation
pwang00 Jan 28, 2020
326aea1
Add necessary files for TUI connectivity
pwang00 Jan 29, 2020
060441e
Add necessary files for TUI connectivity
pwang00 Jan 29, 2020
8174959
Update MonitorWorker
pwang00 Jan 29, 2020
fa15efe
Update protocol
pwang00 Jan 29, 2020
93d8604
Blacken
Jan 30, 2020
7cf8752
Update setup.py dependencies
pwang00 Jan 31, 2020
946c916
Merge branch 'master' of https://github.com/pwang00/manticore
pwang00 Jan 31, 2020
3d8dbde
Remove state debugging messages
pwang00 Jan 31, 2020
3a4f8db
Update setup.py to build protobuf protocol upon install
pwang00 Jan 31, 2020
9da250d
Remove previously generated state_pb2.py
pwang00 Jan 31, 2020
ccf497a
Change subprocess.Popen to subprocess.check_output
pwang00 Jan 31, 2020
b0ac3f3
Remove extraneous output
pwang00 Jan 31, 2020
e9bfda6
Merge branch 'master' into pr/1605
Feb 3, 2020
577fce4
First attempt at fixing protobuf installation
Feb 3, 2020
6eb5e6b
Can't forget the f-string
Feb 3, 2020
eed5d9f
Error on missing protoc
Feb 3, 2020
1a4ab87
Disable auto-generation of protobuf file
Feb 3, 2020
8880d7a
Ignore pb2_errors
Feb 3, 2020
6d05808
Disable monitor start
Feb 4, 2020
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def rtd_dependent_deps():
"lint": lint_deps,
}

subprocess.Popen(protoc_cmd)
output = subprocess.check_output(protoc_cmd)
ekilmer marked this conversation as resolved.
Show resolved Hide resolved

setup(
name="manticore",
Expand Down