Made work on Ubuntu 17.10.

- Changed to python3.6.
- Accepted minor differences in golden files.
- php is now 7.1.
- Updated README.
- Need to test that the AppImage still works.

README.md

@@ -6,7 +6,7 @@ Vigil maintains an up-to-date set of reports for every file in a codebase.
 
 ### Installation
 
-(Tested in Ubuntu 17.04)
+(Tested in Ubuntu 17.10)
 
     # git clone https://github.com/ahamilton/vigil
     # cd vigil

appimage/AppRun

@@ -13,7 +13,7 @@ export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/local/bin/:"${PATH}"
 export UNION_PRELOAD="${HERE}"
 export LD_PRELOAD="${HERE}/libunionpreload.so"
 export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
-export PYTHONPATH=/usr/local/lib/python3.5/dist-packages:"${PYTHONPATH}"
+export PYTHONPATH=/usr/local/lib/python3.6/dist-packages:"${PYTHONPATH}"
 if [ -z $APPIMAGE_ENTER ]; then
     EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
     exec ${EXEC} $@

install-tools

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

make-appimage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

make-readme.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
@@ -23,7 +23,7 @@ Vigil maintains an up-to-date set of reports for every file in a codebase.
 
 ### Installation
 
-(Tested in Ubuntu 17.04)
+(Tested in Ubuntu 17.10)
 
     # git clone https://github.com/ahamilton/vigil
     # cd vigil

setup.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

test_distributions.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

tests/__main___test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

tests/fill3_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.

tests/golden-files/results/metadata-hi3_py

@@ -14,5 +14,5 @@
 (Bmd5:(B            28ca2e417cb64ea4e555efe3203642de          
 (Bsha1:(B           8b8c0214f3f0a0d79032d1b44550064964a33a26  
                                                           
-(Bmime type:(B      text/plain; charset=us-ascii              
-(Bfile type:(B      ASCII text                                (B
+(Bmime type:(B      text/x-python; charset=us-ascii           
+(Bfile type:(B      Python script, ASCII text executable      (B

tests/golden-files/results/mypy-hi_py

@@ -1 +1 @@
-input/hi.py:4: error: Parse error before string literal
+input/hi.py:4: error: Missing parentheses in call to 'print'. Did you mean print(int "hi")?

tests/golden-files/results/python_mccabe-hi3_py

@@ -1 +1 @@
-3:1: 'hi' 1
+3:0: 'hi' 1

tests/golden-files/results/python_mccabe-hi_py

@@ -1 +1 @@
-("3:1: 'hi'", 1)
+("3:0: 'hi'", 1)

tests/golden-files/results/readelf-Mcrt1_o

@@ -38,6 +38,8 @@ There are no section groups in this file.
                                                                                         
 There are no program headers in this file.                                              
                                                                                         
+There is no dynamic section in this file.                                               
+                                                                                        
 There are no relocations in this file.                                                  
                                                                                         
 The decoding of unwind sections for machine type Intel 80386 is not currently supported.

tests/gut_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

tests/lscolors_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2011, 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

tests/termstr_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

tests/tools_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

tests/worker_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

vigil/__main__.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.

vigil/gut.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.

vigil/tools.py

@@ -612,10 +612,10 @@ def uncrustify(path):
     return status, _syntax_highlight_using_path(stdout, path)
 
 
-@deps(deps={"php7.0-cli"}, url="https://en.wikipedia.org/wiki/PHP",
-      executables={"php7.0"})
+@deps(deps={"php7.1-cli"}, url="https://en.wikipedia.org/wiki/PHP",
+      executables={"php7.1"})
 def php7_syntax(path):
-    return _run_command(["php7.0", "--syntax-check", path])
+    return _run_command(["php7.1", "--syntax-check", path])
 
 
 def _pil_pixels(pil_image):

vigil/worker.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 
 # Copyright (C) 2015-2017 Andrew Hamilton. All rights reserved.
 # Licensed under the Artistic License 2.0.