diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 575bd23780..dfc541e6d1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -28,8 +28,7 @@ jobs: token: ${{ secrets.GH_GITHUB_COM_TOKEN || github.token }} - run: | python -m pip install --upgrade pip - python -m pip install .[with-dependencies] - ape plugins install . + python -m pip install .[with-dependencies,ape] - name: Ensure clear Jupyter Notebooks uses: ResearchSoftwareActions/EnsureCleanNotebooksAction@1.1 diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 5aae7811cd..27ca12ad2e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -28,8 +28,7 @@ jobs: token: ${{ secrets.GH_GITHUB_COM_TOKEN || github.token}} - run: | python -m pip install --upgrade pip - python -m pip install .[with-dependencies] - ape plugins install . + python -m pip install .[with-dependencies,ape] - name: Analysing code with pyright run: python -m pyright $(git ls-files '*.py') diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 40850b708b..a6e8c404a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,8 +47,7 @@ jobs: token: ${{ secrets.GH_GITHUB_COM_TOKEN || github.token}} - run: | python -m pip install --upgrade pip - python -m pip install .[with-dependencies,postgres] - ape plugins install . + python -m pip install .[with-dependencies,postgres,ape] python -m pip install coverage - name: Run pytest with coverage diff --git a/Dockerfile b/Dockerfile index cf56c41649..1171ab3efd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,7 @@ COPY . ./ # install elfpy RUN python -m pip install --no-cache-dir --upgrade pip -RUN python -m pip install --no-cache-dir -e ."[with-dependencies]" -RUN ape plugins install . +RUN python -m pip install --no-cache-dir -e ."[with-dependencies,ape]" # copy hyperdrive contracts from migrations image COPY --from=migrations /src/ ./hyperdrive_solidity/ diff --git a/INSTALL.md b/INSTALL.md index a022a32d25..b3df225f83 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,6 +1,6 @@ # Install -- overview -Elf-simulations has been tested with Python 3.9 and 3.10. +Elf-simulations is currently supported only for Python 3.10. ### 1. Install Pyenv @@ -69,7 +69,7 @@ Complete the steps in [Hyperdrive's Pre-requisites section](https://github.com/d ### 7. Install ape plugins -Install Ape plugins with `ape plugins install .` +Install Ape plugins with `python -m pip install --upgrade -e ".[ape]"` ## Notes diff --git a/pyproject.toml b/pyproject.toml index 2223657cde..15e1a8328c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,6 +72,14 @@ docs = [ "urllib3<2.0", ] +ape = [ + "ape-alchemy", + "ape-etherscan", + "ape-foundry", + "ape-solidity", + "eth-ape", +] + [project.urls] "Homepage" = "https://github.com/delvtech/elf-simulations" "Bug Tracker" = "https://github.com/delvtech/elf-simulations/issues"