3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: Add a new klippy-requirements.txt file for virtualenv installs 

Place all of the host software python requirements into a config file.
This makes it easier to update the python requirements without having
to update several installation scripts.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-04-01 22:20:21 -04:00
parent 2980c2e12c
commit 2a55e09ff8
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/install-centos.sh
View File

@ -34,7 +34,7 @@ create_virtualenv()
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install cffi==1.6.0 pyserial==3.2.1 greenlet==0.4.10 ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt
} }
# Step 3: Install startup script # Step 3: Install startup script

2
scripts/install-octopi.sh
View File

@ -37,7 +37,7 @@ create_virtualenv()
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install cffi==1.6.0 pyserial==3.2.1 greenlet==0.4.10 ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt
} }
# Step 3: Install startup script # Step 3: Install startup script

2
scripts/install-ubuntu-18.04.sh
View File

@ -40,7 +40,7 @@ create_virtualenv()
[ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR} [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR}
# Install/update dependencies # Install/update dependencies
${PYTHONDIR}/bin/pip install cffi==1.6.0 pyserial==3.2.1 greenlet==0.4.10 ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt
} }
# Step 3: Install startup script # Step 3: Install startup script

7
scripts/klippy-requirements.txt Normal file
View File

@ -0,0 +1,7 @@
# This file describes the Python virtualenv package requirements for
# the Klipper host software (Klippy). These package requirements are
# typically installed via the command:
# pip install -r virtualenv-requirements.txt
cffi==1.6.0
pyserial==3.2.1
greenlet==0.4.10

2
scripts/travis-install.sh
View File

@ -62,4 +62,4 @@ fi
echo "=============== Install python virtualenv" echo "=============== Install python virtualenv"
cd ${MAIN_DIR} cd ${MAIN_DIR}
virtualenv ${BUILD_DIR}/python-env virtualenv ${BUILD_DIR}/python-env
${BUILD_DIR}/python-env/bin/pip install cffi==1.6.0 pyserial==3.2.1 greenlet==0.4.10 ${BUILD_DIR}/python-env/bin/pip install -r ${MAIN_DIR}/scripts/klippy-requirements.txt