diff --git a/Dockerfile b/Dockerfile index 92af02efa..92a2cb4ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/scripts/travis_install.sh b/scripts/travis_install.sh index 1eb1c3fec..ef5d26c9b 100755 --- a/scripts/travis_install.sh +++ b/scripts/travis_install.sh @@ -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 { @@ -46,3 +43,4 @@ if [ "$1" != "env" ]; then install_mcore $1 fi fi + diff --git a/setup.py b/setup.py index 4b57c7ffe..b524a65b9 100644 --- a/setup.py +++ b/setup.py @@ -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,