Merge branch 'master' into devel

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## 1.2.0 (Unreleased)
 
+### Note for Upgraders
+
+  * The [Cura integration](https://github.com/daid/Cura) has changed in such a way that OctoPrint now calls the
+    [CuraEngine](https://github.com/Ultimaker/CuraEngine) directly instead of depending on the full Cura installation. See
+    [the wiki](https://github.com/foosel/OctoPrint/wiki/Plugin:-Cura) for instructions on how to change your setup to
+    accommodate the new integration.
+
 ### New Features
 
 * Added internationalization of UI. Translations of OctoPrint are being crowd sourced via [Transifex](https://www.transifex.com/projects/p/octoprint/).
@@ -14,7 +21,9 @@
 * OctoPrint now has a [plugin system](http://docs.octoprint.org/en/devel/plugins/index.html) which allows extending its
   core functionality. Plugins may be installed through the new Plugin Manager available in OctoPrint's settings. This
   Plugin Manager also allows browsing and easy installation of plugins registered on the official
-  [OctoPrint Plugin Repository](http://plugins.octoprint.org).
+  [OctoPrint Plugin Repository](http://plugins.octoprint.org). For interested developers there is a
+  [tutorial available in the documentation](http://docs.octoprint.org/en/master/plugins/gettingstarted.html) and also a
+  [cookiecutter template](https://github.com/OctoPrint/cookiecutter-octoprint-plugin) to quickly bootstrap new plugins.
 * New type of API key: [App Session Keys](http://docs.octoprint.org/en/devel/api/apps.html) for trusted applications
 * Printer Profiles: Printer properties like print volume, extruder offsets etc are now managed via Printer Profiles. A
   connection to a printer will always have a printer profile associated.
@@ -27,7 +36,7 @@
 * Mousing over the webcam image in the control tab enables key control mode, allowing you to quickly move the axis of your
   printer with your computer's keyboard ([#610](https://github.com/foosel/OctoPrint/pull/610)):
   - arrow keys: X and Y axes
-  - W, S / PageUp, PageDown: Y axes
+  - W, S / PageUp, PageDown: Z axes
   - Home: Home X and Y axes
   - End: Home Z axes
   - 1, 2, 3, 4: change step size used (0.1, 1, 10, 100mm)
@@ -36,9 +45,9 @@
 * Custom controls now support a row layout
 * Users can now define custom GCODE scripts to run upon starting/pausing/resuming/success/failure of a print or for
   custom controls ([#457](https://github.com/foosel/OctoPrint/issues/457), [#347](https://github.com/foosel/OctoPrint/issues/347))
-* Bundled [Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update) takes care of notifying about new OctoPrint releases and also allows
-  updating if configured as such. Plugins may register themselves with the update notification and application process
-  through a new hook ["octoprint.plugin.softwareupdate.check_config"]().
+* Bundled [Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update) takes care of notifying
+  about new OctoPrint releases and also allows updating if configured as such. Plugins may register themselves with the
+  update notification and application process through a new hook ["octoprint.plugin.softwareupdate.check_config"]().
 
 ### Improvements
 
@@ -58,10 +67,6 @@
     as well). This dialog also allows specifying which action to take after slicing has been completed (none, selecting the
     sliced GCODE for printing or starting to print it directly)
   * Slicers themselves are integrated into the system via ``SlicingPlugins``.
-  * The [Cura integration](https://github.com/daid/Cura) has changed in such a way that OctoPrint now calls the
-    [CuraEngine](https://github.com/Ultimaker/CuraEngine) directly instead of depending on the full Cura installation. See
-    [the wiki](https://github.com/foosel/OctoPrint/wiki/Plugin:-Cura) for instructions on how to change your setup to
-    accommodate the new integration.
   * The "Slicing done" notification is now colored green ([#558](https://github.com/foosel/OctoPrint/issues/558)).
   * The slicing API allows positioning the model to slice on the print bed (Note: this is not yet available in the UI).
 * File management now supports STL files as first class citizens (including UI adjustments to allow management of
@@ -194,6 +199,10 @@
   * Fixed another instance of a missing `branch` field in version dicts generated by versioneer (compare
     [#634](https://github.com/foosel/OctoPrint/pull/634)). Caused an issue when installing from source archive
     downloaded from Github.
+  * [#931](https://github.com/foosel/OctoPrint/issues/931) - Adjusted `octoprint_setuptools` to be compatible to older
+    versions of setuptools potentially site-wide installed on hosts.
+  * Plugin Manager supports installing plugins that need `--process-dependency-links` as `pip` argument. This might be
+    necessary when plugins depend on (patched) library versions that are not yet released on PyPI
 * Various fixes without tickets:
   * GCODE viewer now doesn't stumble over completely extrusionless GCODE files
   * Do not deliver the API key on settings API unless user has admin rights

src/octoprint/plugins/softwareupdate/updaters/pip.py

@@ -25,6 +25,10 @@ def perform_update(target, check, target_version):
 
 	logger.debug("Target: %s, executing pip install %s" % (target, install_arg))
 	pip_args = ["install", check["pip"].format(target_version=target_version, target=target_version)]
+
+	if "dependency_links" in check and check["dependency_links"]:
+		pip_args += "--process-dependency-links"
+
 	_pip.main(pip_args)
 
 	if "force_reinstall" in check and check["force_reinstall"]: