From 5da52b6c57ae3e232dba1382a6a3dd2adab34d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 12 Jun 2015 17:30:32 +0200 Subject: [PATCH 1/3] Preparing release of 1.2.0-rc2 --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1822f7e5..7cf61518 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,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. @@ -194,6 +196,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 From 4badf72e187830fe09d2fce1ebfe4a6f0d2eaab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 12 Jun 2015 20:15:22 +0200 Subject: [PATCH 2/3] New section "Note for Upgraders" & corrected a typo --- CHANGELOG.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7cf61518..67ecc184 100644 --- a/CHANGELOG.md +++ b/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/). @@ -29,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) @@ -38,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 @@ -60,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 From 608be52b9acd3b855bf78806d44b926b46224b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sat, 13 Jun 2015 19:36:28 +0200 Subject: [PATCH 3/3] softwareupdate: plugins may now specify that they have dependency links Update plugin will then also process those during pip install. Was missing previously and caused Pushbullet Plugin to not properly update. --- src/octoprint/plugins/softwareupdate/updaters/pip.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/octoprint/plugins/softwareupdate/updaters/pip.py b/src/octoprint/plugins/softwareupdate/updaters/pip.py index 882c4944..3b1eeac4 100644 --- a/src/octoprint/plugins/softwareupdate/updaters/pip.py +++ b/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"]: