Skip to content

Commit

Permalink
Darn, yeah not sure where PANDA team would prefer sphinx to be. But t…
Browse files Browse the repository at this point in the history
…he more I think about it, it feels better within build requirements as technically, this should have nothing to do with pypanda on its own. Also, I do notthink install ubuntu needs to repeat installing pip and cffi
  • Loading branch information
AndrewQuijano committed May 26, 2024
1 parent 34b7171 commit 7e5d375
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 2 additions & 0 deletions panda/dependencies/ubuntu_20.04_build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ libpixman-1-dev
zip

# python tools to install and distribute PyPanda
# Sphinx is used wihtin GitHub Actions to update Documentation in the container
python3-setuptools
python3-wheel
python3-sphinx

# pypanda test dependencies
gcc-multilib
Expand Down
2 changes: 2 additions & 0 deletions panda/dependencies/ubuntu_22.04_build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ libpixman-1-dev
zip

# python tools to install and distribute PyPanda
# Sphinx is used wihtin GitHub Actions to update Documentation in the container
python3-setuptools
python3-wheel
python3-sphinx

# pypanda test dependencies
gcc-multilib
Expand Down
3 changes: 1 addition & 2 deletions panda/python/core/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ cffi>=1.14.3
protobuf>=4.25.1
colorama
capstone
pycparser
sphinx
pycparser
5 changes: 0 additions & 5 deletions panda/scripts/install_ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ git --help &>/dev/null || $SUDO apt-get -qq update && $SUDO apt-get -qq install

# some globals
PANDA_GIT="https://github.com/panda-re/panda.git"
LIBDWARF_GIT="git://git.code.sf.net/p/libdwarf/code"
LIBOSI_VERSION="0.1.3"

# system information
Expand Down Expand Up @@ -124,10 +123,6 @@ if [[ !$(dpkg -l | grep -q libosi) ]]; then
popd # Return to the original directory
fi

# PyPANDA needs CFFI from pip (the version in apt is too old)
# Install system-wide since PyPANDA install will also be system-wide
$SUDO python3 -m pip install pip

progress "Trying to update DTC submodule"
git submodule update --init dtc || true

Expand Down

0 comments on commit 7e5d375

Please sign in to comment.