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

Revert Unicorn Dependency Update #1459

Merged
merged 2 commits into from
Jun 6, 2019
Merged

Revert Unicorn Dependency Update #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b11c6ac
Partial revert for Unicorn Dependency Update
Jun 6, 2019
cc2867c
re-blacken
Jun 6, 2019
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL dockerfile_maintenance=trailofbits

ENV LANG C.UTF-8

RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git wget python
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install python3 python3-pip git wget

# Install solc 0.4.25 and validate it
RUN wget https://github.com/ethereum/solidity/releases/download/v0.4.25/solc-static-linux \
Expand Down
6 changes: 2 additions & 4 deletions scripts/travis_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ function install_mcore {
EXTRAS="dev"
fi

# Unicorn needs python2
export UNICORN_QEMU_FLAGS="--python=/usr/bin/python"

pip install -I --no-binary keystone-engine -e .[$EXTRAS] # ks can have pip install issues
pip install --no-binary keystone-engine -e .[$EXTRAS] # ks can have pip install issues
}

function install_cc_env {
Expand All @@ -46,3 +43,4 @@ if [ "$1" != "env" ]; then
install_mcore $1
fi
fi

6 changes: 1 addition & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ 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 @ git+https://github.com/unicorn-engine/unicorn.git@778171fc9546c1fc3d1341ff1151eab379848ea0#subdirectory=bindings/python&egg=unicorn-1.0.1.post0",
]
native_deps = ["capstone==4.0.1", "pyelftools", "unicorn"]

extra_require = {
"native": native_deps,
Expand Down