Gina Häußge
be79cf289e
Merge branch 'maintenance' into devel
2015-09-30 16:00:56 +02:00
Gina Häußge
5cc8ec5cc3
Better wording for plugin system startup & sorted plugin list of ALL plugins
2015-09-30 16:00:32 +02:00
Gina Häußge
982f24fe31
PMGR: Better wording of "pip unavailable" message
2015-09-30 15:59:08 +02:00
Gina Häußge
0a1816e52f
Better error reporting in PipUtil for errors during pip setup detection
2015-09-30 15:58:38 +02:00
Gina Häußge
2926b5c8d5
PMGR: only mark as pending (un)installed if restart is needed
2015-09-30 14:30:10 +02:00
Gina Häußge
fdcc6ac367
PMGR: Only add --user flag if not running in a virtual env
2015-09-30 14:25:06 +02:00
Gina Häußge
2eb80c550f
PMGR: Disable plugin remove button if plugin is not managable
2015-09-30 13:44:58 +02:00
Gina Häußge
ca587454df
PMGR: Fixed marking of plugins
...
Plugins can now (again) show if they are pending installation,
uninstallation and also if they are managable at all.
2015-09-30 13:37:27 +02:00
Gina Häußge
e64975c85c
PMGR: Debug output in frontend to indicate venv
2015-09-30 13:36:45 +02:00
Gina Häußge
4a97864e01
PMGR: Added option to force use of --user flag
2015-09-30 13:36:00 +02:00
Gina Häußge
28fc7d74f4
Made plugin marking in PluginManager more flexible
...
Now supports arbitrary markers for plugins. Also added a method
to check if a plugin was marked with a specified marker.
2015-09-30 13:33:25 +02:00
Gina Häußge
fbfac4b569
PluginManager also scans user site packages
...
In case the user site packages are not yet part of the used
working set OR the sys path and ENABLE_USER_SITE is true, the
manager will now make sure that the folder is searched for plugins
as well upon plugin reload.
This is necessary since Python will not automatically include the
user site directory upon firing up the program in case there's
nothing installed to it/it doesn't exist. If a plugin is installed
during run time with --user that will lead to it not being found,
which is undesirable. Hence run time manipulation of sys.path and
the workingset becomes necessary.
2015-09-30 13:30:39 +02:00
Gina Häußge
10db8c9577
PluginManager now marks plugins as managable
...
Managable currently pretty much only means "uninstallable".
Plugins are managable if their installation location is writable
and - if they are installed from an entry point and OctoPrint is
running in a virtual environment - within the bounds of the virtual
environment (because otherwise pip will not allow to uninstall).
2015-09-30 13:28:58 +02:00
Gina Häußge
7c5fe46f4a
More intelligence for PipUtil to determine when to use --user
...
Includes a force_user (and a force_sudo) parameter.
2015-09-30 13:27:24 +02:00
Gina Häußge
6ed96764e1
Merge branch 'devel' into dev/pipUserParameter
2015-09-29 16:41:11 +02:00
Gina Häußge
79b8639135
Fix: Use adjusted pip arguments in execute method
2015-09-29 16:38:26 +02:00
Gina Häußge
62478fd98f
More pip data in plugin manager front end
2015-09-29 14:51:58 +02:00
Gina Häußge
22509f02b5
Make sure to include testballoon package in install
2015-09-29 14:23:10 +02:00
Gina Häußge
cae73c1ee5
Cache for pip setup and version information
...
Can take a bit of time to collect that data since it needs some invocations of
pip, so we cache that data unless told otherwise.
2015-09-29 14:22:29 +02:00
Gina Häußge
5df576b73e
Install testballoon using pip install . in testballoon folder
2015-09-29 13:53:48 +02:00
Gina Häußge
000f8e9310
Debug logging for testballoon install
2015-09-29 13:47:35 +02:00
Gina Häußge
7d38d66489
PipUtil now uses --user argument with pip install if detected as necessary
2015-09-29 13:39:08 +02:00
Gina Häußge
705f0706fd
Merge branch 'fix/pmgrPipWithSudo' into devel
...
Conflicts:
src/octoprint/util/pip.py
2015-09-28 20:21:40 +02:00
Gina Häußge
fce7b40b51
pip: Use string representation of version for display in UI
2015-09-28 20:20:56 +02:00
Gina Häußge
697affc62d
Merge branch 'fix/pmgrPipWithSudo' into devel
...
Conflicts:
src/octoprint/plugins/pluginmanager/__init__.py
src/octoprint/util/pip.py
2015-09-28 19:57:05 +02:00
Gina Häußge
1178fe9e95
Support sudo for installing plugins, but warn about it
2015-09-28 19:53:30 +02:00
Gina Häußge
2f24e73fcb
Merge branch 'fix/logsDocsBug' into maintenance
2015-09-28 13:08:57 +02:00
Gina Häußge
39a0441f34
Merge branch 'fix/logsDocsBug' into devel
2015-09-28 13:08:42 +02:00
Gina Häußge
9ff5c36370
Fixed a documentation bug
2015-09-28 13:08:35 +02:00
Gina Häußge
f3e242d3a0
Merge remote-tracking branch 'origin/devel' into devel
2015-09-28 13:02:38 +02:00
Gina Häußge
0b4e590a5b
Refactored drop zone processing in GcodeFilesViewModel
2015-09-28 13:01:47 +02:00
Gina Häußge
96d479bd67
Merge branch 'fix/noDropFileuploads' into devel
2015-09-28 12:55:54 +02:00
Gina Häußge
1b4ea75466
Fix: Don't have file upload widgets listen to drop events by default
...
That way they won't be triggered by gcode uploads when all they are interested in
are uploads via a single file input.
2015-09-28 12:55:32 +02:00
Mark Walker
2411b4260e
Update css for change 42d754 to the less
2015-09-23 11:51:36 -07:00
Gina Häußge
055a5d06f6
Fix: Correctly persist all changes to gcode scripts
2015-09-23 13:40:41 +02:00
Gina Häußge
0a30438040
Merge branch 'fix/contentTypeHeaderCheck' into devel
2015-09-22 15:43:57 +02:00
Gina Häußge
b4b5689bc4
Fix: Correctly handle unset Content-Type header for command requests
2015-09-22 15:23:50 +02:00
Gina Häußge
b38b38e359
Merge branch 'fix/pmgrPipConfig' into devel
2015-09-22 11:39:55 +02:00
Gina Häußge
fd4271a962
PipCaller: Added back missing member variable
2015-09-22 11:39:45 +02:00
Gina Häußge
2a4ee5072c
Merge branch 'fix/pmgrPipConfig' into devel
...
Conflicts:
src/octoprint/plugins/pluginmanager/__init__.py
src/octoprint/util/pip.py
2015-09-22 11:39:02 +02:00
Gina Häußge
65bc28a03e
PMGR: Added configuration dialog and info re used pip binary & version
2015-09-22 11:36:57 +02:00
Gina Häußge
c26515c13d
PipCaller: Allow update of used pip command
2015-09-22 11:35:47 +02:00
Gina Häußge
25a4d4b79b
SWU: Track check origins, ignore if from unavailable plugin
...
There was a problem with software update checks configurations stored in
config.yaml for which the providing plugin was then removed, since those
check definitions then lacked their default values to be merged on whatever
was stored in config.yaml, causing incomplete check configurations as a
consequence over which the plugin tripped.
This patch fixes that in that it tracks which check config keys are provided
by plugins and only returns those as the active check configurations that
belong to plugins that are still in the system.
TODO: This is only half of the solution. Check configurations of plugins
that are being uninstalled should be removed from the config if the
user decides to remove any settings by the plugin too. We need some
adjustments in the lifecycle tracking in order to make this possible
however, so for now this must suffice to at least prevent any errors from
occuring when incomplete configs are encountered.
(cherry picked from commit 8af8b8f
2015-09-21 16:46:44 +02:00
Gina Häußge
43ca4d8252
SWU: Do not overwrite check information again
...
Current version information of OctoPrint from a check definition
could be overwritten for checks under certain circumstances.
2015-09-21 16:42:11 +02:00
Gina Häußge
a05e3a44af
Updated tornado, sockjs-tornado and psutil dependencies
2015-09-21 15:00:06 +02:00
Gina Häußge
cbc500a939
Merge branch 'patch-1' of https://github.com/dragondgold/OctoPrint into pr/dragondgold/patch-1
2015-09-21 09:00:04 +02:00
Gina Häußge
d2e2cb814f
M400 and proper M114 in virtual printer
2015-09-21 08:41:28 +02:00
Andres
119f3ba45b
Fixed wrong urls
2015-09-20 17:44:49 -03:00
Gina Häußge
a431331aa9
Merge pull request #1066 from punkkeks/devel
...
changed magic line from python->python2
2015-09-19 16:29:17 +02:00
Marcel Hellwig
e46e7b3ee2
changed magic line from python->python2
...
Since python is sometimes (and for me on arch linux) a symlink to the
python3 utils, you should be more explicit with that.
2015-09-17 18:04:14 +02:00
