From 777c42c97997f094a843917085994f10847fc059 Mon Sep 17 00:00:00 2001
From: dvanaken <dvanaken@cs.cmu.edu>
Date: Tue, 22 Oct 2019 15:11:03 -0400
Subject: [PATCH] Bumped numpy from 1.13.1 to 1.14.0 to satisfy TF 1.12.2
 dependency. Updated grep commands in validator to also be compatible with
 BSD.

---
 script/git-hooks/pre-commit           | 2 +-
 script/validators/source_validator.py | 6 +++---
 server/analysis/nn_tf.py              | 9 ++++-----
 server/website/requirements.txt       | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/script/git-hooks/pre-commit b/script/git-hooks/pre-commit
index 8520241..b9aa5eb 100755
--- a/script/git-hooks/pre-commit
+++ b/script/git-hooks/pre-commit
@@ -14,7 +14,7 @@
 #   ln -s ../../script/git-hooks/pre-commit ./pre-commit
 
 
-FILES=$(git diff --name-only --cached --diff-filter=d | grep -E '*\.(py|java)$')
+FILES=$(git diff --name-only --cached --diff-filter=d | grep -E '.*\.(py|java)$')
 
 WEBSITE_TESTS_RESULT=0
 ANALYSIS_TESTS_RESULT=0
diff --git a/script/validators/source_validator.py b/script/validators/source_validator.py
index 17d8a82..c803a5b 100644
--- a/script/validators/source_validator.py
+++ b/script/validators/source_validator.py
@@ -206,15 +206,15 @@ def validate_dir(root_dir):
 def get_git_files(state):
     if state == 'staged':
         # Files staged for commit
-        cmd = r"git diff --name-only --cached --diff-filter=d | grep -E '*\.(py|java)$'"
+        cmd = r"git diff --name-only --cached --diff-filter=d | grep -E '.*\.(py|java)$'"
 
     elif state == 'unstaged':
         # Tracked files not staged for commit
-        cmd = r"git diff --name-only --diff-filter=d | grep -E '*\.(py|java)$'"
+        cmd = r"git diff --name-only --diff-filter=d | grep -E '.*\.(py|java)$'"
 
     elif state == 'untracked':
         # Untracked files not staged for commit
-        cmd = r"git ls-files --other --exclude-standard | grep -E '*\.(py|java)$'"
+        cmd = r"git ls-files --other --exclude-standard | grep -E '.*\.(py|java)$'"
 
     with settings(warn_only=True):
         res = local(cmd, capture=True)
diff --git a/server/analysis/nn_tf.py b/server/analysis/nn_tf.py
index 9034495..4ba318c 100644
--- a/server/analysis/nn_tf.py
+++ b/server/analysis/nn_tf.py
@@ -12,7 +12,6 @@ import pickle
 import numpy as np
 import tensorflow as tf
 from tensorflow import keras
-from tensorflow.keras import layers
 
 from .util import get_analysis_logger
 
@@ -50,10 +49,10 @@ class NeuralNet(object):
         self.optimizer = tf.train.AdamOptimizer(learning_rate=self.learning_rate)
         # input X is placeholder, weights are variables.
         self.model = keras.Sequential([
-            layers.Dense(64, activation=tf.nn.relu, input_shape=[n_input]),
-            layers.Dropout(0.5),
-            layers.Dense(64, activation=tf.nn.relu),
-            layers.Dense(1)
+            keras.layers.Dense(64, activation=tf.nn.relu, input_shape=[n_input]),
+            keras.layers.Dropout(0.5),
+            keras.layers.Dense(64, activation=tf.nn.relu),
+            keras.layers.Dense(1)
         ])
         self.model.compile(loss='mean_squared_error',
                            optimizer=self.optimizer,
diff --git a/server/website/requirements.txt b/server/website/requirements.txt
index 6507939..56739ad 100644
--- a/server/website/requirements.txt
+++ b/server/website/requirements.txt
@@ -8,7 +8,7 @@ django-request-logging==0.4.6
 mock==2.0.0
 Fabric3>=1.13.1.post1
 hurry.filesize>=0.9
-numpy==1.13.1
+numpy==1.14.0
 requests==2.18.4
 pycodestyle==2.3.1
 astroid==1.5.1