Changed installation to use pip3.

- Now running all the tests in test-distributions.
- Vigil is only known to install into ubuntu at the moment.
This commit is contained in:
Andrew Hamilton 2017-07-10 18:38:18 +01:00
parent b0ea939924
commit ed5164c761
3 changed files with 16 additions and 6 deletions

View file

@ -11,7 +11,11 @@ Vigil maintains an up-to-date set of reports for every file in a codebase.
# git clone https://github.com/ahamilton/vigil # git clone https://github.com/ahamilton/vigil
# cd vigil # cd vigil
# ./install-dependencies # ./install-dependencies
# sudo python3 setup.py install (pip3 can be used here) # pip3 install .
To test its working properly:
# ./test-all
then to run: then to run:

View file

@ -28,7 +28,11 @@ Vigil maintains an up-to-date set of reports for every file in a codebase.
# git clone https://github.com/ahamilton/vigil # git clone https://github.com/ahamilton/vigil
# cd vigil # cd vigil
# ./install-dependencies # ./install-dependencies
# sudo python3 setup.py install (pip3 can be used here) # pip3 install .
To test its working properly:
# ./test-all
then to run: then to run:

View file

@ -40,6 +40,7 @@ function build_ubuntu {
run_in_container ubuntu.part \ run_in_container ubuntu.part \
ln -sf /lib/systemd/resolv.conf /etc/resolv.conf ln -sf /lib/systemd/resolv.conf /etc/resolv.conf
run_in_container ubuntu.part apt-get update run_in_container ubuntu.part apt-get update
run_in_container ubuntu.part apt-get install --yes python3-pip
mv ubuntu.part ubuntu mv ubuntu.part ubuntu
} }
@ -147,7 +148,8 @@ function remove_gentoo {
[ $# -eq 0 ] && WORK_PATH=$(mktemp -d --suffix=-vigil) || WORK_PATH="$1" [ $# -eq 0 ] && WORK_PATH=$(mktemp -d --suffix=-vigil) || WORK_PATH="$1"
sudo apt-get install -y systemd-container debootstrap xz-utils wget sudo apt-get install -y systemd-container debootstrap xz-utils wget
cd $WORK_PATH cd $WORK_PATH
for DISTRIBUTION in ubuntu fedora debian archlinux opensuse pixel gentoo; do # FIX: Reenable: fedora debian archlinux opensuse pixel gentoo
for DISTRIBUTION in ubuntu; do
if [ -e $DISTRIBUTION ]; then if [ -e $DISTRIBUTION ]; then
echo "$DISTRIBUTION container already exists." echo "$DISTRIBUTION container already exists."
else else
@ -157,9 +159,9 @@ for DISTRIBUTION in ubuntu fedora debian archlinux opensuse pixel gentoo; do
echo "Installing vigil's dependencies in $DISTRIBUTION..." echo "Installing vigil's dependencies in $DISTRIBUTION..."
run_in_container $DISTRIBUTION ./install-dependencies run_in_container $DISTRIBUTION ./install-dependencies
echo "Installing vigil in $DISTRIBUTION..." echo "Installing vigil in $DISTRIBUTION..."
run_in_container $DISTRIBUTION sudo python3 setup.py install run_in_container $DISTRIBUTION pip3 install .
echo "Testing executables are installed in $DISTRIBUTION..." echo "Testing vigil in $DISTRIBUTION..."
run_in_container $DISTRIBUTION ./tests/tools_test.py ExecutablesTestCase run_in_container $DISTRIBUTION ./test-all
echo "Running vigil in $DISTRIBUTION..." echo "Running vigil in $DISTRIBUTION..."
run_in_container $DISTRIBUTION vigil --help run_in_container $DISTRIBUTION vigil --help
echo "Successfully installed vigil in $DISTRIBUTION." echo "Successfully installed vigil in $DISTRIBUTION."