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.

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

Bump to CheckoutV2 #1654

Merged
merged 2 commits into from
Apr 6, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- name: Set up Python 3.6
uses: actions/setup-python@v1
with:
Expand Down
10 changes: 8 additions & 2 deletions manticore/core/smtlib/solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,14 @@ def _send(self, cmd: str):
"""
# logger.debug('>%s', cmd)
try:
self._proc.stdout.flush()
self._proc.stdin.write(f"{cmd}\n")
if self._proc.stdout:
self._proc.stdout.flush()
else:
raise SolverError("Could not flush stdout: file descriptor is None")
if self._proc.stdin:
self._proc.stdin.write(f"{cmd}\n")
else:
raise SolverError("Could not write to stdin: file descriptor is None")
except IOError as e:
raise SolverError(str(e))

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ def rtd_dependent_deps():

# If you update native_deps please update the `REQUIREMENTS_TO_IMPORTS` dict in `utils/install_helper.py`
# (we need to know how to import a given native dependency so we can check if native dependencies are installed)
native_deps = ["capstone==4.0.1", "pyelftools", "unicorn==1.0.2rc1"]
native_deps = ["capstone==4.0.1", "pyelftools", "unicorn==1.0.2rc2"]

lint_deps = ["black==19.3b0", "mypy==0.740"]
lint_deps = ["black==19.10b0", "mypy==0.770"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised there weren't any differences to formatting when upgrading black!


# Development dependencies without keystone
dev_noks = (
Expand Down