Skip to content

Instantly share code, notes, and snippets.

@shawnkirsch

shawnkirsch/gist:9bf7d58377e580aa3828db3589b96a50 Secret

Created January 10, 2017 06:40
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save shawnkirsch/9bf7d58377e580aa3828db3589b96a50 to your computer and use it in GitHub Desktop.
Save shawnkirsch/9bf7d58377e580aa3828db3589b96a50 to your computer and use it in GitHub Desktop.
Download ZIP
updatefix_test_switch_to_release_branch
Raw
gistfile1.txt
pi@octopi ~/OctoPrint $ 2017-01-10 06:38:48,542 - octoprint.plugins.softwareupdate - INFO - Starting update of octoprint to 101471235cc6923709b5e99d927ae21b07a8c029...
2017-01-10 06:38:56,355 - octoprint.plugins.softwareupdate.updaters.update_script - ERROR - Target: octoprint, error while executing update script, got returncode 1
Traceback (most recent call last):
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/updaters/update_script.py", line 62, in perform_update
folder = check.get("update_folder", check.get("checkout_folder")) # either should be set, tested above
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/util.py", line 25, in execute
raise ScriptError(p.returncode, p.stdout.text, p.stderr.text)
ScriptError
2017-01-10 06:38:56,359 - octoprint.plugins.softwareupdate.updaters.update_script - WARNING - Target: octoprint, update stdout:
>>> Running: git diff --shortstat
>>> Running: git pull
Updating 6c622f7..1014712
Fast-forward
.gitattributes | 9 +
.github/ISSUE_TEMPLATE.md | 79 +
.github/PULL_REQUEST_TEMPLATE.md | 50 +
.gitignore | 15 +
.travis.yml | 5 +-
.versioneer-lookup | 20 +-
AUTHORS.md | 21 +
CHANGELOG.md | 526 +-
CONTRIBUTING.md | 451 +-
MANIFEST.in | 4 +-
README.md | 33 +-
SUPPORTERS.md | 72 +
THIRDPARTYLICENSES.md | 57 +
docs/api/connection.rst | 8 +-
docs/api/datamodel.rst | 63 +-
docs/api/{fileops.rst => files.rst} | 298 +-
docs/api/general.rst | 14 +-
docs/api/index.rst | 13 +-
docs/api/job.rst | 88 +-
docs/api/languages.rst | 232 +
docs/api/logs.rst | 4 +-
docs/api/printer.rst | 76 +-
docs/api/printerprofiles.rst | 403 +-
docs/api/push.rst | 74 +-
docs/api/settings.rst | 237 +
docs/api/slicing.rst | 10 +-
docs/api/system.rst | 242 +
docs/api/timelapse.rst | 255 +
docs/api/users.rst | 314 +
docs/api/util.rst | 308 +
docs/api/wizard.rst | 75 +
docs/bundledplugins/cura.rst | 138 +
docs/bundledplugins/discovery.rst | 184 +
docs/bundledplugins/index.rst | 13 +
docs/bundledplugins/pluginmanager.rst | 84 +
docs/bundledplugins/softwareupdate.rst | 389 +
docs/conf.py | 8 +-
docs/configuration/config_yaml.rst | 165 +-
docs/configuration/yaml.rst | 4 +-
docs/development/index.rst | 181 +-
docs/events/index.rst | 270 +-
docs/features/custom_controls.rst | 2 +-
docs/features/gcode_scripts.rst | 48 +-
docs/features/index.rst | 4 +
.../bundledplugins-discovery-windowsexplorer.png | Bin 0 -> 65337 bytes
.../bundledplugins-pluginmanager-installing.png | Bin 0 -> 50435 bytes
.../bundledplugins-pluginmanager-mainscreen.png | Bin 0 -> 77583 bytes
.../bundledplugins-pluginmanager-repofilters.png | Bin 0 -> 53454 bytes
...plugins-softwareupdate-plugin-configuration.png | Bin 0 -> 29121 bytes
docs/index.rst | 3 +
docs/jsclientlib/base.rst | 405 +
docs/jsclientlib/browser.rst | 40 +
docs/jsclientlib/connection.rst | 49 +
docs/jsclientlib/control.rst | 57 +
docs/jsclientlib/files.rst | 273 +
docs/jsclientlib/index.rst | 72 +
docs/jsclientlib/job.rst | 82 +
docs/jsclientlib/languages.rst | 37 +
docs/jsclientlib/logs.rst | 39 +
docs/jsclientlib/printer.rst | 317 +
docs/jsclientlib/printerprofiles.rst | 48 +
docs/jsclientlib/settings.rst | 41 +
docs/jsclientlib/slicing.rst | 60 +
docs/jsclientlib/socket.rst | 114 +
docs/jsclientlib/system.rst | 38 +
docs/jsclientlib/timelapse.rst | 90 +
docs/jsclientlib/users.rst | 106 +
docs/jsclientlib/util.rst | 159 +
docs/jsclientlib/wizard.rst | 29 +
docs/modules/cli.rst | 31 +
docs/modules/index.rst | 1 +
docs/plugins/concepts.rst | 349 +-
docs/plugins/controlproperties.rst | 146 +
docs/plugins/distributing.rst | 25 +-
docs/plugins/gettingstarted.rst | 127 +-
docs/plugins/helpers.rst | 76 +
docs/plugins/hooks.rst | 432 +-
docs/plugins/index.rst | 7 +-
docs/plugins/injectedproperties.rst | 56 +
docs/plugins/mixins.rst | 224 +-
docs/plugins/viewmodels.rst | 214 +-
docs/sphinxext/codeblockext.py | 2 +-
run | 2 +-
scripts/octoprint.default | 10 +-
scripts/octoprint.init | 35 +-
setup.cfg | 11 +
setup.py | 138 +-
src/octoprint/__init__.py | 457 +-
src/octoprint/_version.py | 675 +-
src/octoprint/cli/__init__.py | 155 +
src/octoprint/cli/client.py | 182 +
src/octoprint/cli/config.py | 221 +
src/octoprint/cli/dev.py | 235 +
src/octoprint/cli/plugins.py | 104 +
src/octoprint/cli/server.py | 160 +
src/octoprint/daemon.py | 185 +-
src/octoprint/events.py | 82 +-
src/octoprint/filemanager/__init__.py | 106 +-
src/octoprint/filemanager/analysis.py | 31 +-
src/octoprint/filemanager/destinations.py | 1 +
src/octoprint/filemanager/storage.py | 612 +-
src/octoprint/filemanager/util.py | 2 +-
src/octoprint/logging/__init__.py | 4 +
src/octoprint/logging/handlers.py | 136 +
src/octoprint/plugin/__init__.py | 132 +-
src/octoprint/plugin/core.py | 311 +-
src/octoprint/plugin/types.py | 825 +-
src/octoprint/plugins/announcements/__init__.py | 377 +
.../announcements/static/css/announcements.css | 1 +
.../announcements/static/js/announcements.js | 304 +
.../announcements/static/less/announcements.less | 56 +
.../announcements/templates/announcements.jinja2 | 45 +
.../templates/announcements_navbar.jinja2 | 3 +
.../templates/announcements_settings.jinja2 | 34 +
src/octoprint/plugins/corewizard/__init__.py | 176 +
.../plugins/corewizard/static/js/corewizard.js | 152 +
.../templates/corewizard_acl_wizard.jinja2 | 59 +
.../corewizard_printerprofile_wizard.jinja2 | 35 +
.../corewizard_servercommands_wizard.jinja2 | 19 +
.../templates/corewizard_webcam_wizard.jinja2 | 42 +
src/octoprint/plugins/cura/__init__.py | 150 +-
src/octoprint/plugins/cura/profile.py | 180 +-
src/octoprint/plugins/cura/static/js/cura.js | 106 +-
.../plugins/cura/templates/cura_settings.jinja2 | 108 +-
.../plugins/cura/templates/cura_wizard.jinja2 | 36 +
.../snippets/settings/cura/engineLog.jinja2 | 7 +
.../snippets/settings/cura/enginePath.jinja2 | 10 +
.../snippets/settings/cura/profileImporter.jinja2 | 64 +
.../snippets/settings/cura/profiles.jinja2 | 34 +
src/octoprint/plugins/discovery/__init__.py | 11 +-
src/octoprint/plugins/pluginmanager/__init__.py | 215 +-
.../pluginmanager/static/js/pluginmanager.js | 404 +-
.../templates/pluginmanager_about.jinja2 | 18 +
.../templates/pluginmanager_settings.jinja2 | 87 +-
src/octoprint/plugins/softwareupdate/__init__.py | 362 +-
src/octoprint/plugins/softwareupdate/cli.py | 201 +
src/octoprint/plugins/softwareupdate/exceptions.py | 2 +-
.../softwareupdate/scripts/update-octoprint.py | 271 +-
.../softwareupdate/static/css/softwareupdate.css | 2 +-
.../softwareupdate/static/js/softwareupdate.js | 400 +-
.../softwareupdate/static/less/softwareupdate.less | 46 +-
.../plugins/softwareupdate/checkoutFolder.jinja2 | 6 +
.../plugins/softwareupdate/releaseChannel.jinja2 | 7 +
.../plugins/softwareupdate/versionTracking.jinja2 | 6 +
.../softwareupdate/templates/softwareupdate.jinja2 | 29 +
.../templates/softwareupdate_settings.jinja2 | 34 +-
.../templates/softwareupdate_wizard.jinja2 | 16 +
.../plugins/softwareupdate/updaters/__init__.py | 2 +-
.../plugins/softwareupdate/updaters/pip.py | 43 +-
.../softwareupdate/updaters/python_updater.py | 6 +-
.../softwareupdate/updaters/update_script.py | 81 +-
src/octoprint/plugins/softwareupdate/util.py | 2 +-
.../softwareupdate/version_checks/__init__.py | 2 +-
.../softwareupdate/version_checks/commandline.py | 2 +-
.../softwareupdate/version_checks/git_commit.py | 4 +-
.../softwareupdate/version_checks/github_commit.py | 2 +-
.../version_checks/github_release.py | 223 +-
.../version_checks/python_checker.py | 2 +-
src/octoprint/plugins/virtual_printer/__init__.py | 47 +-
src/octoprint/plugins/virtual_printer/virtual.py | 861 +-
src/octoprint/printer/__init__.py | 127 +-
src/octoprint/printer/estimation.py | 2 +-
src/octoprint/printer/profile.py | 138 +-
src/octoprint/printer/standard.py | 556 +-
src/octoprint/server/__init__.py | 798 +-
src/octoprint/server/api/__init__.py | 272 +-
src/octoprint/server/api/connection.py | 10 +-
src/octoprint/server/api/files.py | 674 +-
src/octoprint/server/api/job.py | 14 +-
src/octoprint/server/api/languages.py | 36 +-
src/octoprint/server/api/log.py | 20 +-
src/octoprint/server/api/printer.py | 65 +-
src/octoprint/server/api/printer_profiles.py | 41 +-
src/octoprint/server/api/settings.py | 160 +-
src/octoprint/server/api/slicing.py | 70 +-
src/octoprint/server/api/system.py | 185 +
src/octoprint/server/api/timelapse.py | 197 +-
src/octoprint/server/api/users.py | 43 +-
src/octoprint/server/apps/__init__.py | 2 +-
src/octoprint/server/util/__init__.py | 117 +-
src/octoprint/server/util/flask.py | 761 +-
src/octoprint/server/util/sockjs.py | 84 +-
src/octoprint/server/util/tornado.py | 130 +-
src/octoprint/server/util/watchdog.py | 64 +-
src/octoprint/server/views.py | 694 +-
src/octoprint/settings.py | 785 +-
src/octoprint/slicing/__init__.py | 123 +-
src/octoprint/slicing/exceptions.py | 15 +-
src/octoprint/static/css/octoprint.css | 2 +-
src/octoprint/static/gcodeviewer/js/Worker.js | 1009 +-
src/octoprint/static/gcodeviewer/js/renderer.js | 16 +-
src/octoprint/static/gcodeviewer/js/ui.js | 19 +-
src/octoprint/static/intermediary.html | 264 +
.../static/js/app/bindings/allowbindings.js | 6 +
.../static/js/app/bindings/contextmenu.js | 12 +
src/octoprint/static/js/app/bindings/copywidth.js | 38 +
src/octoprint/static/js/app/bindings/invisible.js | 8 +
src/octoprint/static/js/app/bindings/popover.js | 16 +
src/octoprint/static/js/app/bindings/qrcode.js | 24 +
.../static/js/app/bindings/slimscrolledforeach.js | 17 +
src/octoprint/static/js/app/bindings/toggle.js | 24 +
.../static/js/app/bindings/togglecontent.js | 28 +
src/octoprint/static/js/app/client/base.js | 292 +
src/octoprint/static/js/app/client/browser.js | 29 +
src/octoprint/static/js/app/client/connection.js | 27 +
src/octoprint/static/js/app/client/control.js | 53 +
src/octoprint/static/js/app/client/files.js | 192 +
src/octoprint/static/js/app/client/job.js | 42 +
src/octoprint/static/js/app/client/languages.js | 22 +
src/octoprint/static/js/app/client/logs.js | 25 +
src/octoprint/static/js/app/client/printer.js | 210 +
.../static/js/app/client/printerprofiles.js | 46 +
src/octoprint/static/js/app/client/settings.js | 43 +
src/octoprint/static/js/app/client/slicing.js | 45 +
src/octoprint/static/js/app/client/socket.js | 175 +
src/octoprint/static/js/app/client/system.js | 24 +
src/octoprint/static/js/app/client/timelapse.js | 113 +
src/octoprint/static/js/app/client/users.js | 110 +
src/octoprint/static/js/app/client/util.js | 47 +
src/octoprint/static/js/app/client/wizard.js | 18 +
src/octoprint/static/js/app/dataupdater.js | 476 +-
src/octoprint/static/js/app/helpers.js | 418 +-
src/octoprint/static/js/app/main.js | 421 +-
src/octoprint/static/js/app/viewmodels/about.js | 45 +
.../static/js/app/viewmodels/appearance.js | 4 +-
.../static/js/app/viewmodels/connection.js | 37 +-
src/octoprint/static/js/app/viewmodels/control.js | 201 +-
src/octoprint/static/js/app/viewmodels/files.js | 1046 +-
src/octoprint/static/js/app/viewmodels/firstrun.js | 88 -
src/octoprint/static/js/app/viewmodels/gcode.js | 214 +-
src/octoprint/static/js/app/viewmodels/log.js | 24 +-
.../static/js/app/viewmodels/loginstate.js | 100 +-
.../static/js/app/viewmodels/navigation.js | 34 +-
.../static/js/app/viewmodels/printerprofiles.js | 680 +-
.../static/js/app/viewmodels/printerstate.js | 138 +-
src/octoprint/static/js/app/viewmodels/settings.js | 759 +-
src/octoprint/static/js/app/viewmodels/slicing.js | 247 +-
src/octoprint/static/js/app/viewmodels/system.js | 108 +
.../static/js/app/viewmodels/temperature.js | 232 +-
src/octoprint/static/js/app/viewmodels/terminal.js | 172 +-
.../static/js/app/viewmodels/timelapse.js | 237 +-
src/octoprint/static/js/app/viewmodels/users.js | 187 +-
.../static/js/app/viewmodels/usersettings.js | 49 +-
src/octoprint/static/js/app/viewmodels/wizard.js | 209 +
src/octoprint/static/js/lib/README.txt | 8 +
src/octoprint/static/js/lib/bootstrap/bootstrap.js | 334 +-
.../js/lib/jquery/jquery.bootstrap.wizard.js | 341 +
src/octoprint/static/js/lib/jquery/jquery.js | 9814 ++++++++++++++++
src/octoprint/static/js/lib/jquery/jquery.min.js | 9 +-
src/octoprint/static/js/lib/knockout.js | 206 +-
src/octoprint/static/js/lib/less.min.js | 26 +-
src/octoprint/static/js/lib/lodash.js |12352 ++++++++++++++++++++
src/octoprint/static/js/lib/lodash.min.js | 178 +-
src/octoprint/static/js/lib/sockjs-0.3.4.min.js | 27 -
src/octoprint/static/js/lib/sockjs.js | 5612 +++++++++
src/octoprint/static/js/lib/sockjs.min.js | 3 +
src/octoprint/static/less/octoprint.less | 192 +-
src/octoprint/templates/_data/agpl.html | 677 ++
src/octoprint/templates/dialogs/about.jinja2 | 53 +
src/octoprint/templates/dialogs/about/about.jinja2 | 49 +
.../templates/dialogs/about/authors.jinja2 | 1 +
.../templates/dialogs/about/changelog.jinja2 | 1 +
.../templates/dialogs/about/license.jinja2 | 1 +
.../templates/dialogs/about/supporters.jinja2 | 1 +
.../templates/dialogs/about/thirdparty.jinja2 | 1 +
.../templates/dialogs/confirmation.jinja2 | 14 -
src/octoprint/templates/dialogs/files.jinja2 | 21 +
src/octoprint/templates/dialogs/firstrun.jinja2 | 54 -
src/octoprint/templates/dialogs/settings.jinja2 | 27 +-
.../dialogs/settings/accesscontrol.jinja2 | 2 +-
.../templates/dialogs/settings/appearance.jinja2 | 11 +-
.../templates/dialogs/settings/features.jinja2 | 78 +-
.../templates/dialogs/settings/folders.jinja2 | 2 +
.../templates/dialogs/settings/gcodescripts.jinja2 | 7 +
.../dialogs/settings/gcodevisualizer.jinja2 | 29 +
.../dialogs/settings/printerprofiles.jinja2 | 194 +-
.../dialogs/settings/serialconnection.jinja2 | 92 +-
.../templates/dialogs/settings/server.jinja2 | 21 +-
.../templates/dialogs/settings/webcam.jinja2 | 69 +-
src/octoprint/templates/dialogs/slicing.jinja2 | 8 +-
.../templates/dialogs/usersettings.jinja2 | 2 +-
.../templates/dialogs/usersettings/access.jinja2 | 4 +-
src/octoprint/templates/dialogs/wizard.jinja2 | 66 +
.../templates/dialogs/wizard/firstrun_end.jinja2 | 12 +
.../templates/dialogs/wizard/firstrun_start.jinja2 | 7 +
src/octoprint/templates/index.jinja2 | 24 +-
src/octoprint/templates/initscript.jinja2 | 19 +-
src/octoprint/templates/javascripts.jinja2 | 16 +-
src/octoprint/templates/navbar/settings.jinja2 | 2 +-
src/octoprint/templates/navbar/systemmenu.jinja2 | 8 +-
src/octoprint/templates/overlays/reloadui.jinja2 | 9 +-
src/octoprint/templates/sidebar/files.jinja2 | 42 +-
.../templates/sidebar/files_header.jinja2 | 23 +-
src/octoprint/templates/sidebar/state.jinja2 | 32 +-
.../settings/printerprofiles/profileEditor.jinja2 | 40 +
.../printerprofiles/profileEditorAxes.jinja2 | 56 +
.../profileEditorBuildvolume.jinja2 | 132 +
.../printerprofiles/profileEditorExtruder.jinja2 | 47 +
.../printerprofiles/profileEditorGeneral.jinja2 | 29 +
.../settings/printerprofiles/profiles.jinja2 | 30 +
.../server/serverCommandServerRestart.jinja2 | 6 +
.../server/serverCommandSystemRestart.jinja2 | 6 +
.../server/serverCommandSystemShutdown.jinja2 | 6 +
.../snippets/settings/webcam/ffmpegBitrate.jinja2 | 9 +
.../snippets/settings/webcam/ffmpegPath.jinja2 | 10 +
.../snippets/settings/webcam/ffmpegThreads.jinja2 | 6 +
.../snippets/settings/webcam/watermark.jinja2 | 7 +
.../settings/webcam/webcamOrientation.jinja2 | 17 +
.../settings/webcam/webcamSnapshotUrl.jinja2 | 10 +
.../settings/webcam/webcamStreamUrl.jinja2 | 10 +
src/octoprint/templates/stylesheets.jinja2 | 17 +-
src/octoprint/templates/tabs/control.jinja2 | 43 +-
src/octoprint/templates/tabs/gcodeviewer.jinja2 | 32 +-
src/octoprint/templates/tabs/temperature.jinja2 | 4 +-
src/octoprint/templates/tabs/terminal.jinja2 | 26 +-
src/octoprint/templates/tabs/timelapse.jinja2 | 64 +-
src/octoprint/timelapse.py | 754 +-
.../translations/de/LC_MESSAGES/messages.mo | Bin 51414 -> 89154 bytes
.../translations/de/LC_MESSAGES/messages.po | 3059 +++--
src/octoprint/users.py | 51 +-
src/octoprint/util/__init__.py | 407 +-
src/octoprint/util/avr_isp/chipDB.py | 2 +-
src/octoprint/util/avr_isp/intelHex.py | 6 +-
src/octoprint/util/avr_isp/ispBase.py | 3 +-
src/octoprint/util/avr_isp/stk500v2.py | 14 +-
src/octoprint/util/comm.py | 1610 ++-
src/octoprint/util/commandline.py | 137 +
src/octoprint/util/dev.py | 66 +
src/octoprint/util/gcodeInterpreter.py | 287 +-
src/octoprint/util/jinja.py | 218 +
src/octoprint/util/paths.py | 19 +
src/octoprint/util/pip.py | 436 +-
src/octoprint/util/piptestballoon/setup.py | 48 +
src/octoprint_client/__init__.py | 384 +
src/octoprint_setuptools/__init__.py | 23 +-
tests/filemanager/test_filemanager.py | 192 +-
tests/filemanager/test_localstorage.py | 364 +-
.../plugin/_plugins/another_ordered_hook_plugin.py | 6 +
tests/plugin/_plugins/hook_plugin.py | 5 +-
tests/plugin/_plugins/mixed_plugin/__init__.py | 8 +-
tests/plugin/_plugins/one_ordered_hook_plugin.py | 6 +
tests/plugin/_plugins/startup_plugin.py | 8 +-
tests/plugin/test_core.py | 86 +-
tests/plugin/test_settings.py | 20 +-
tests/plugin/test_types_blueprint.py | 139 +
tests/plugin/test_types_settings.py | 313 +
tests/printer/test_estimation.py | 10 +-
tests/server/__init__.py | 11 +
tests/server/util/__init__.py | 10 +
tests/server/util/flask.py | 592 +
tests/server/util/tornado.py | 95 +
tests/settings/__init__.py | 10 +
tests/settings/_files/config.yaml | 15 +
tests/settings/_files/defaults.yaml | 21 +
tests/settings/test_settings.py | 581 +
tests/slicing/test_slicingmanager.py | 11 +-
tests/static/js/lib/qunit-1.18.0.css | 291 +
tests/static/js/lib/qunit-1.18.0.js | 3828 ++++++
tests/static/js/lib/qunit-parameterize.js | 133 +
tests/static/js/test-helpers.html | 18 +
tests/static/js/test-helpers.js | 80 +
tests/test_daemon.py | 475 +
tests/timelapse/__init__.py | 9 +
tests/timelapse/test_timelapse_helpers.py | 182 +
tests/users/__init__.py | 112 +
.../_files/jinja_test_data/.hidden_everywhere.txt | 1 +
tests/util/_files/jinja_test_data/normal_text.txt | 1 +
tests/util/_files/jinja_test_data/not_a_text.dat | 1 +
tests/util/_files/utf8_with_bom.txt | 3 +
tests/util/_files/utf8_without_bom.txt | 3 +
tests/util/test_comm_helpers.py | 62 +-
tests/util/test_counted_event.py | 144 +
tests/util/test_file_helpers.py | 360 +
tests/util/test_jinja.py | 76 +
tests/util/test_repeated_timer.py | 22 +-
translations/de/LC_MESSAGES/messages.mo | Bin 51414 -> 89154 bytes
translations/de/LC_MESSAGES/messages.po | 3059 +++--
translations/messages.pot | 3039 +++--
versioneer.py | 2310 ++--
379 files changed, 78774 insertions(+), 11654 deletions(-)
create mode 100644 .github/ISSUE_TEMPLATE.md
create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
create mode 100644 SUPPORTERS.md
create mode 100644 THIRDPARTYLICENSES.md
rename docs/api/{fileops.rst => files.rst} (60%)
create mode 100644 docs/api/languages.rst
create mode 100644 docs/api/settings.rst
create mode 100644 docs/api/system.rst
create mode 100644 docs/api/timelapse.rst
create mode 100644 docs/api/users.rst
create mode 100644 docs/api/util.rst
create mode 100644 docs/api/wizard.rst
create mode 100644 docs/bundledplugins/cura.rst
create mode 100644 docs/bundledplugins/discovery.rst
create mode 100644 docs/bundledplugins/index.rst
create mode 100644 docs/bundledplugins/pluginmanager.rst
create mode 100644 docs/bundledplugins/softwareupdate.rst
create mode 100644 docs/images/bundledplugins-discovery-windowsexplorer.png
create mode 100644 docs/images/bundledplugins-pluginmanager-installing.png
create mode 100644 docs/images/bundledplugins-pluginmanager-mainscreen.png
create mode 100644 docs/images/bundledplugins-pluginmanager-repofilters.png
create mode 100644 docs/images/bundledplugins-softwareupdate-plugin-configuration.png
create mode 100644 docs/jsclientlib/base.rst
create mode 100644 docs/jsclientlib/browser.rst
create mode 100644 docs/jsclientlib/connection.rst
create mode 100644 docs/jsclientlib/control.rst
create mode 100644 docs/jsclientlib/files.rst
create mode 100644 docs/jsclientlib/index.rst
create mode 100644 docs/jsclientlib/job.rst
create mode 100644 docs/jsclientlib/languages.rst
create mode 100644 docs/jsclientlib/logs.rst
create mode 100644 docs/jsclientlib/printer.rst
create mode 100644 docs/jsclientlib/printerprofiles.rst
create mode 100644 docs/jsclientlib/settings.rst
create mode 100644 docs/jsclientlib/slicing.rst
create mode 100644 docs/jsclientlib/socket.rst
create mode 100644 docs/jsclientlib/system.rst
create mode 100644 docs/jsclientlib/timelapse.rst
create mode 100644 docs/jsclientlib/users.rst
create mode 100644 docs/jsclientlib/util.rst
create mode 100644 docs/jsclientlib/wizard.rst
create mode 100644 docs/modules/cli.rst
create mode 100644 docs/plugins/controlproperties.rst
create mode 100644 docs/plugins/helpers.rst
create mode 100644 docs/plugins/injectedproperties.rst
create mode 100644 setup.cfg
create mode 100644 src/octoprint/cli/__init__.py
create mode 100644 src/octoprint/cli/client.py
create mode 100644 src/octoprint/cli/config.py
create mode 100644 src/octoprint/cli/dev.py
create mode 100644 src/octoprint/cli/plugins.py
create mode 100644 src/octoprint/cli/server.py
create mode 100644 src/octoprint/logging/__init__.py
create mode 100644 src/octoprint/logging/handlers.py
create mode 100644 src/octoprint/plugins/announcements/__init__.py
create mode 100644 src/octoprint/plugins/announcements/static/css/announcements.css
create mode 100644 src/octoprint/plugins/announcements/static/js/announcements.js
create mode 100644 src/octoprint/plugins/announcements/static/less/announcements.less
create mode 100644 src/octoprint/plugins/announcements/templates/announcements.jinja2
create mode 100644 src/octoprint/plugins/announcements/templates/announcements_navbar.jinja2
create mode 100644 src/octoprint/plugins/announcements/templates/announcements_settings.jinja2
create mode 100644 src/octoprint/plugins/corewizard/__init__.py
create mode 100644 src/octoprint/plugins/corewizard/static/js/corewizard.js
create mode 100644 src/octoprint/plugins/corewizard/templates/corewizard_acl_wizard.jinja2
create mode 100644 src/octoprint/plugins/corewizard/templates/corewizard_printerprofile_wizard.jinja2
create mode 100644 src/octoprint/plugins/corewizard/templates/corewizard_servercommands_wizard.jinja2
create mode 100644 src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2
create mode 100644 src/octoprint/plugins/cura/templates/cura_wizard.jinja2
create mode 100644 src/octoprint/plugins/cura/templates/snippets/settings/cura/engineLog.jinja2
create mode 100644 src/octoprint/plugins/cura/templates/snippets/settings/cura/enginePath.jinja2
create mode 100644 src/octoprint/plugins/cura/templates/snippets/settings/cura/profileImporter.jinja2
create mode 100644 src/octoprint/plugins/cura/templates/snippets/settings/cura/profiles.jinja2
create mode 100644 src/octoprint/plugins/pluginmanager/templates/pluginmanager_about.jinja2
create mode 100644 src/octoprint/plugins/softwareupdate/cli.py
create mode 100644 src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/checkoutFolder.jinja2
create mode 100644 src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/releaseChannel.jinja2
create mode 100644 src/octoprint/plugins/softwareupdate/templates/snippets/plugins/softwareupdate/versionTracking.jinja2
create mode 100644 src/octoprint/plugins/softwareupdate/templates/softwareupdate.jinja2
create mode 100644 src/octoprint/plugins/softwareupdate/templates/softwareupdate_wizard.jinja2
create mode 100644 src/octoprint/server/api/system.py
delete mode 100644 src/octoprint/static/empty
create mode 100644 src/octoprint/static/intermediary.html
create mode 100644 src/octoprint/static/js/app/bindings/allowbindings.js
create mode 100644 src/octoprint/static/js/app/bindings/contextmenu.js
create mode 100644 src/octoprint/static/js/app/bindings/copywidth.js
create mode 100644 src/octoprint/static/js/app/bindings/invisible.js
create mode 100644 src/octoprint/static/js/app/bindings/popover.js
create mode 100644 src/octoprint/static/js/app/bindings/qrcode.js
create mode 100644 src/octoprint/static/js/app/bindings/slimscrolledforeach.js
create mode 100644 src/octoprint/static/js/app/bindings/toggle.js
create mode 100644 src/octoprint/static/js/app/bindings/togglecontent.js
create mode 100644 src/octoprint/static/js/app/client/base.js
create mode 100644 src/octoprint/static/js/app/client/browser.js
create mode 100644 src/octoprint/static/js/app/client/connection.js
create mode 100644 src/octoprint/static/js/app/client/control.js
create mode 100644 src/octoprint/static/js/app/client/files.js
create mode 100644 src/octoprint/static/js/app/client/job.js
create mode 100644 src/octoprint/static/js/app/client/languages.js
create mode 100644 src/octoprint/static/js/app/client/logs.js
create mode 100644 src/octoprint/static/js/app/client/printer.js
create mode 100644 src/octoprint/static/js/app/client/printerprofiles.js
create mode 100644 src/octoprint/static/js/app/client/settings.js
create mode 100644 src/octoprint/static/js/app/client/slicing.js
create mode 100644 src/octoprint/static/js/app/client/socket.js
create mode 100644 src/octoprint/static/js/app/client/system.js
create mode 100644 src/octoprint/static/js/app/client/timelapse.js
create mode 100644 src/octoprint/static/js/app/client/users.js
create mode 100644 src/octoprint/static/js/app/client/util.js
create mode 100644 src/octoprint/static/js/app/client/wizard.js
create mode 100644 src/octoprint/static/js/app/viewmodels/about.js
delete mode 100644 src/octoprint/static/js/app/viewmodels/firstrun.js
create mode 100644 src/octoprint/static/js/app/viewmodels/system.js
create mode 100644 src/octoprint/static/js/app/viewmodels/wizard.js
create mode 100644 src/octoprint/static/js/lib/README.txt
create mode 100644 src/octoprint/static/js/lib/jquery/jquery.bootstrap.wizard.js
create mode 100644 src/octoprint/static/js/lib/jquery/jquery.js
create mode 100644 src/octoprint/static/js/lib/lodash.js
delete mode 100644 src/octoprint/static/js/lib/sockjs-0.3.4.min.js
create mode 100644 src/octoprint/static/js/lib/sockjs.js
create mode 100644 src/octoprint/static/js/lib/sockjs.min.js
create mode 100644 src/octoprint/templates/_data/agpl.html
delete mode 100644 src/octoprint/templates/dialogs/_snippets/changepassword.jinja2
create mode 100644 src/octoprint/templates/dialogs/about.jinja2
create mode 100644 src/octoprint/templates/dialogs/about/about.jinja2
create mode 100644 src/octoprint/templates/dialogs/about/authors.jinja2
create mode 100644 src/octoprint/templates/dialogs/about/changelog.jinja2
create mode 100644 src/octoprint/templates/dialogs/about/license.jinja2
create mode 100644 src/octoprint/templates/dialogs/about/supporters.jinja2
create mode 100644 src/octoprint/templates/dialogs/about/thirdparty.jinja2
delete mode 100644 src/octoprint/templates/dialogs/confirmation.jinja2
create mode 100644 src/octoprint/templates/dialogs/files.jinja2
delete mode 100644 src/octoprint/templates/dialogs/firstrun.jinja2
create mode 100644 src/octoprint/templates/dialogs/settings/gcodevisualizer.jinja2
create mode 100644 src/octoprint/templates/dialogs/wizard.jinja2
create mode 100644 src/octoprint/templates/dialogs/wizard/firstrun_end.jinja2
create mode 100644 src/octoprint/templates/dialogs/wizard/firstrun_start.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/printerprofiles/profileEditor.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/printerprofiles/profileEditorAxes.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/printerprofiles/profileEditorBuildvolume.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/printerprofiles/profileEditorExtruder.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/printerprofiles/profileEditorGeneral.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/printerprofiles/profiles.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/server/serverCommandServerRestart.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/server/serverCommandSystemRestart.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/server/serverCommandSystemShutdown.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/ffmpegBitrate.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/ffmpegPath.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/ffmpegThreads.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/watermark.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/webcamOrientation.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/webcamSnapshotUrl.jinja2
create mode 100644 src/octoprint/templates/snippets/settings/webcam/webcamStreamUrl.jinja2
create mode 100644 src/octoprint/util/commandline.py
create mode 100644 src/octoprint/util/dev.py
create mode 100644 src/octoprint/util/jinja.py
create mode 100644 src/octoprint/util/paths.py
create mode 100644 src/octoprint/util/piptestballoon/setup.py
create mode 100644 src/octoprint_client/__init__.py
create mode 100644 tests/plugin/_plugins/another_ordered_hook_plugin.py
create mode 100644 tests/plugin/_plugins/one_ordered_hook_plugin.py
create mode 100644 tests/plugin/test_types_blueprint.py
create mode 100644 tests/plugin/test_types_settings.py
create mode 100644 tests/server/__init__.py
create mode 100644 tests/server/util/__init__.py
create mode 100644 tests/server/util/flask.py
create mode 100644 tests/server/util/tornado.py
create mode 100644 tests/settings/__init__.py
create mode 100644 tests/settings/_files/config.yaml
create mode 100644 tests/settings/_files/defaults.yaml
create mode 100644 tests/settings/test_settings.py
create mode 100644 tests/static/js/lib/qunit-1.18.0.css
create mode 100644 tests/static/js/lib/qunit-1.18.0.js
create mode 100644 tests/static/js/lib/qunit-parameterize.js
create mode 100644 tests/static/js/test-helpers.html
create mode 100644 tests/static/js/test-helpers.js
create mode 100644 tests/test_daemon.py
create mode 100644 tests/timelapse/__init__.py
create mode 100644 tests/timelapse/test_timelapse_helpers.py
create mode 100644 tests/users/__init__.py
create mode 100644 tests/util/_files/jinja_test_data/.hidden_everywhere.txt
create mode 100644 tests/util/_files/jinja_test_data/normal_text.txt
create mode 100644 tests/util/_files/jinja_test_data/not_a_text.dat
create mode 100644 tests/util/_files/utf8_with_bom.txt
create mode 100644 tests/util/_files/utf8_without_bom.txt
create mode 100644 tests/util/test_counted_event.py
create mode 100644 tests/util/test_file_helpers.py
create mode 100644 tests/util/test_jinja.py
>>> Running: python setup.py clean
"python setup.py clean" failed with returncode 1: running clean
Deleting build directory
Continuing anyways
running clean
Deleting build directory
>>> Running: python setup.py install
2017-01-10 06:38:56,377 - octoprint.plugins.softwareupdate.updaters.update_script - WARNING - Target: octoprint, update stderr:
Traceback (most recent call last):
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py", line 180, in <module>
raise RuntimeError("Could not update, \"git diff\" failed with returncode {}".format(returncode))
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py", line 177, in main
print(">>> Running: git diff --shortstat")
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/scripts/update-octoprint.py", line 130, in install_source
else:
RuntimeError: Could not update, "python setup.py install" failed with returncode 1: running install
Checking .pth file support in /usr/local/lib/python2.7/dist-packages/
2017-01-10 06:38:56,379 - octoprint.plugins.softwareupdate - ERROR - Update of octoprint can not be performed
Traceback (most recent call last):
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/__init__.py", line 617, in _perform_update
"""
File "/home/pi/OctoPrint/src/octoprint/plugins/softwareupdate/updaters/update_script.py", line 69, in perform_update
UpdateError
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment