Skip to content

Commit

Permalink
Merge pull request #120 from crytic/docker-build
Browse files Browse the repository at this point in the history
Drop rusty-rlp from dependencies
  • Loading branch information
anishnaik authored Nov 1, 2022
2 parents d4fdd70 + b8771e8 commit fbac641
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@

The format is based on [Keep a Changelog](http://keepachangelog.com/).

## [Unreleased](https://github.com/trailofbits/etheno/compare/v0.3.0...HEAD)
## [Unreleased](https://github.com/trailofbits/etheno/compare/v0.3.2...HEAD)

## 0.3.0 - 2022-07-08
## 0.3.2 - 2022-11-01

### Fixed
- Dropped `rusty-rlp` dependency so that ARM Docker builds work as expected during QEMU emulation

## 0.3.1 - 2022-11-01

### Changed
- We are now using `ganache` instead of `ganache-cli` for running Ganache
Expand Down
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
python3-pip \
python3-setuptools

# Needed for rusty-rlp wheel
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV PATH="/root/.cargo/bin:${PATH}"

RUN --mount=type=bind,target=/etheno \
cd /etheno && \
pip3 install --no-cache-dir --upgrade pip setuptools && \
pip3 wheel --no-cache-dir -w /wheels \
https://github.com/cburgdorf/rusty-rlp/archive/refs/tags/0.1.15.tar.gz \
.


Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
description="Etheno is a JSON RPC multiplexer, differential fuzzer, and test framework integration tool.",
url="https://github.com/trailofbits/etheno",
author="Trail of Bits",
version="0.3.1",
version="0.3.2",
packages=find_packages(),
python_requires=">=3.7",
install_requires=[
Expand All @@ -24,10 +24,6 @@
"eth-rlp<0.3.0",
"setuptools",
],
# rusty-rlp==0.1.15 has to be downloaded as a tarball
dependency_links=[
"https://github.com/cburgdorf/rusty-rlp/archive/refs/tags/0.1.15.tar.gz"
],
entry_points={"console_scripts": ["etheno = etheno.__main__:main"]},
classifiers=[
"Development Status :: 4 - Beta",
Expand Down

0 comments on commit fbac641

Please sign in to comment.