Used test-distributions to fix the installation.

- Correctly using our urwid.
- LS_COLORS needed to be in the package.
- Didn't need to use pip3.

README.md

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

make-readme.py

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

setup.py

@@ -17,7 +17,8 @@ setup(name="vigil",
       url="https://github.com/ahamilton/vigil",
       author="Andrew Hamilton",
       license="Artistic 2.0",
-      packages=["vigil"],
+      packages=["vigil", "vigil.urwid"],
+      package_data={"vigil": ["LS_COLORS.sh"]},
       entry_points={"console_scripts":
                     ["vigil=vigil.__main__:entry_point",
                      "vigil-worker=vigil.worker:main"]})

test-distributions

@@ -156,9 +156,13 @@ for DISTRIBUTION in ubuntu fedora debian archlinux opensuse pixel gentoo; do
     fi
     echo "Installing vigil's dependencies in $DISTRIBUTION..."
     run_in_container $DISTRIBUTION ./install-dependencies
+    echo "Installing vigil in $DISTRIBUTION..."
+    run_in_container $DISTRIBUTION sudo python3 setup.py install
     echo "Testing executables are installed in $DISTRIBUTION..."
-    run_in_container $DISTRIBUTION ./tools_test.py ExecutablesTestCase
-    echo "Successfully installed vigil's dependencies in $DISTRIBUTION."
+    run_in_container $DISTRIBUTION ./tests/tools_test.py ExecutablesTestCase
+    echo "Running vigil in $DISTRIBUTION..."
+    run_in_container $DISTRIBUTION vigil --help
+    echo "Successfully installed vigil in $DISTRIBUTION."
     echo "Removing $DISTRIBUTION container..."
     remove_$DISTRIBUTION
 done

vigil/fill3.py

@@ -12,8 +12,8 @@ import os
 import signal
 import sys
 
-import urwid
-import urwid.raw_display
+import vigil.urwid
+import vigil.urwid.raw_display
 
 import vigil.terminal as terminal
 import vigil.termstr as termstr
@@ -436,7 +436,7 @@ def patch_screen(widget):
 
 @contextlib.contextmanager
 def _urwid_screen():
-    screen = urwid.raw_display.Screen()
+    screen = vigil.urwid.raw_display.Screen()
     screen.set_mouse_tracking(True)
     screen.start()
     try:

vigil/tools.py

@@ -400,8 +400,7 @@ def pycodestyle(path):
     return _run_command([_python_version(path), "-m", "pycodestyle", path])
 
 
-@deps(deps={"python-pyflakes", "python3-pyflakes"},
-      arch_deps={"python2-pyflakes", "python-pyflakes"},
+@deps(deps={"pyflakes"}, arch_deps={"python2-pyflakes", "python-pyflakes"},
       opensuse_deps={"python2-pyflakes", "python3-pyflakes"}, url="pyflakes",
       missing_in={"gentoo"})
 def pyflakes(path):

vigil/urwid/raw_display.py

@@ -28,7 +28,7 @@ import sys
 import termios
 import tty
 
-from urwid import escape
+from vigil.urwid import escape
 
 
 class Screen: