Modify ccd_defs_check.py to work with the pre-commit hook, delete perl version

Former-commit-id: c24f667900
gh-pages
Farkas Szilárd 2015-11-13 18:35:10 +01:00
rodzic 6d470afb42
commit ff13ad2d85
3 zmienionych plików z 9 dodań i 22 usunięć

Wyświetl plik

@ -1,20 +0,0 @@
#!/usr/bin/env perl
use strict;
use File::Basename qw( dirname );
use File::Spec;
use JSON;
my $dir = dirname($0);
my $ccd_defs = File::Spec->catfile($dir, 'ccd_defs.json');
open my $fh, $ccd_defs
or die "Unable to open $ccd_defs : $!";
local $/;
my $json = <$fh>; # Slurp
close $fh;
decode_json($json);
print "CCD_DEFS compiles OK\n";
exit 0;

Wyświetl plik

@ -14,7 +14,12 @@ try:
ccd_defs = get_ccd_widths()
print "CCD_DEFS compiles OK"
print "Definitions in file: {0}".format(len(ccd_defs))
exit_code=0
except IOError as e:
print "I/O error with CCD_DEFS file: {0}".format(e.strerror)
exit_code=255
except:
print "Error with CCD_DEFS file: {0}".format(sys.exc_info()[1])
exit_code=255
sys.exit(exit_code)

Wyświetl plik

@ -11,12 +11,14 @@ exec 1>&2
echo "RUNNING PRE-COMMIT"
EXIT_CODE=0
# Get list of files about to be committed
if git diff --cached --name-only --diff-filter=ACM | grep 'ccd_defs.json'; then
echo "We changed ccd_defs.json"
GIT_ROOT=$(git rev-parse --show-toplevel)
perl $GIT_ROOT/ccd_defs_check.pl
python $GIT_ROOT/ccd_defs_check.py
EXIT_CODE=$(echo $?)
fi
# non-zero exit fails the commit
exit 0
exit $EXIT_CODE