moving in the code from final comp to main (#698)

* Check in Y11 Shepherd

* Revert changes

* Moved dpad staffbot code; using git LFS

* Minor shepherd fixes

* Fixed some lint issues

Author: FIREdog5

.gitattributes

@@ -5,3 +5,8 @@ dawn/static/website-robot-api-master/assets/fonts/* linguist-vendored
 hibike/Arduino-Makefile/* linguist-vendored
 hibike/lib/* linguist-vendored
 hibike/lib/hibike/* linguist-vendored=false
+shepherd/static/Spoiled_Candies.xcf filter=lfs diff=lfs merge=lfs -text
+shepherd/static/Twisted.xcf filter=lfs diff=lfs merge=lfs -text
+shepherd/static/BlueTwisted.xcf filter=lfs diff=lfs merge=lfs -text
+shepherd/static/GoldTwisted.xcf filter=lfs diff=lfs merge=lfs -text
+shepherd/static/icons[[:space:]]copy.ai filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -397,9 +397,8 @@ hibike/virtual_devices.txt
 # Webstorm project settings
 .idea
 
-# Visual Studio Code config
-.vscode
-
+# Visual Studio Code settings
+.vscode/
 
 ### Custom
 /dawn-*

.travis.yml

@@ -17,12 +17,13 @@ matrix:
       env: TEST_DIR=runtime
     - name: Shepherd
       language: python
-      python: 3.6
+      python: 3.7
       env: TEST_DIR=shepherd
 addons:
   apt:
     packages:
       - python3-pip
+      - libasound2-dev
       - socat
 env:
   global:

DevOps/frankfurter/scripts/update/install_update

@@ -4,6 +4,8 @@
 #
 # Usage: install_update [extracted-tarball-root]
 
+sudo rm -rf /docs
+
 piecentral="$HOME/PieCentral"
 piecentral_backup="$HOME/PieCentral-backup"
 systemd_units="/etc/systemd/system"
@@ -37,6 +39,8 @@ replace_package "$1/runtime" "$piecentral/runtime"
 replace_package "$1/hibike" "$piecentral/hibike"
 replace_package "$1/docs" "$HOME/docs"
 
+sudo pip3 install "$1/resources/"*.whl "$1/resources/"*.tar.gz
+
 # Restore files that should persist
 cp "$piecentral_backup/runtime/studentCode.py" "$piecentral/runtime"
 cp "$piecentral_backup/runtime/namedPeripherals.csv" "$piecentral/runtime"

ansible-protos/fieldcontrol.proto

@@ -7,7 +7,7 @@ start:
 	yarn start
 
 install:
-	yarn install --frozen-lockfile
+	yarn install
 
 artifacts-install:
 	yarn add --no-lockfile electron-packager

dawn/Makefile

@@ -41,7 +41,7 @@
     "babel-preset-stage-3": "6.24.1",
     "better-npm-run": "0.1.0",
     "chai": "4.1.2",
-    "electron-devtools-installer": "2.2.3",
+    "electron-devtools-installer": "2.2.4",
     "electron-packager": "^10.1.1",
     "eslint": "4.18.1",
     "eslint-config-airbnb": "16.1.0",