Merge pull request #48 from jssimporter/homebysix-patch-1

Homebysix patch 1

.gitignore

@@ -1 +1,2 @@
 *.xml
+.vscode/*

CHANGELOG.md

@@ -4,6 +4,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
 
+## [3.0.0b5] - 2020-02-03 Kawaii
+### CHANGED
+- Emoji are no longer shown unless the new `--kawaii` argument is passed at the command line.
+- Emoji are rendered differently in python 2 and 3. This is to deal with attempted fixes in 
+  versions 3.0.0b3 and 3.0.0b4 which were only partially successful.
+
+## [3.0.0b2] - 2020-02-03 Bruce Lee Spruce Three
+### CHANGED
+- Now requires python-jss 2.1.0 or above,
+  as installed via JSSImporter 1.1.0 or above,
+  i.e. in the folder `/Library/AutoPkg/JSSImporter`.
+  Also requires Python3, best run using the AutoPkg-supplied python3 binary:
+  `/Library/AutoPkg/Python3/Python.framework/Versions/Current/bin/python3 ./spruce.py -h`
+  python-jss installed from `pip` or from source will be ignored.
+- The default preferences are now taken directly from the AutoPkg preferences,
+  i.e. `com.github.autopkg`.
+- A few updates to the code were required to function with python3 and to accommodate
+  upstream changes to python-jss.
+
+
 ## [3.0.0b1] - 2019-08-18 Alpine Spruce (Picea alpestris)
 ### CHANGED
 - Now requires python-jss 2.0.0 or above,

README.md

@@ -10,6 +10,12 @@ Instructions for use
 
 **For details on how to use Spruce, please visit our [Wiki](https://github.com/jssimporter/Spruce/wiki).**
 
+**IMPORTANT:**
+Spruce 3 requires python-jss 2.1.0 and python3, with the `Foundation` module. The simplest way to achieve this is to install AutoPkg 2.0 and JSSImporter 1.1.0, and then run Spruce using the python that is supplied with AutoPkg:
+
+```
+/Library/AutoPkg/Python3/Python.framework/Versions/Current/bin/python3 ./spruce.py -h
+```
 
 Acknowledgements
 ----------------