Commit graph

2630 commits

Author SHA1 Message Date
Gina Häußge
44561dae15 Fixed some indentation 2015-06-30 15:04:22 +02:00
Gina Häußge
70eb490e02 Merge branch 'dev/versioneerUpdate' into devel
Conflicts:
	.versioneer-lookup
2015-06-30 15:03:04 +02:00
Gina Häußge
711810d18b Switched to new version of versioneer
Versions should now be PEP440 compatible.
2015-06-30 14:57:39 +02:00
Gina Häußge
e98dc59c94 Merge branch 'maintenance' into devel
Conflicts:
	CHANGELOG.md
2015-06-30 10:13:05 +02:00
Gina Häußge
0b3f94b6bd maintenance branch is now 1.2.2-dev 2015-06-30 10:12:14 +02:00
Gina Häußge
9f8d30a66c Preparing release of 1.2.1 2015-06-30 08:42:16 +02:00
Gina Häußge
2a8eea086c Only print command of event handler to log when debug flag is present
(cherry picked from commit 49d28c5)
2015-06-30 08:28:16 +02:00
Gina Häußge
49d28c58b3 Only print command of event handler to log when debug flag is present 2015-06-29 21:08:20 +02:00
Gina Häußge
bb0bfaee56 Fix: Increase max body size for plugin archives
Closes #957
(cherry picked from commit af89097)
2015-06-29 21:01:21 +02:00
Gina Häußge
af89097204 Fix: Increase max body size for plugin archives
Closes #957
2015-06-29 20:59:46 +02:00
Gina Häußge
b8209e8e09 Switch to pkg_resources for compatibility check
Plugin Manager now internally uses pkg_resources.parse_version and
pkg_resources.parse_requirements to check for version compatibility
with plugins from the repository. That will allow to directly use
the OctoPrint version string once it's PEP440 compatible.
(cherry picked from commit 8eb61a9)
2015-06-29 18:24:23 +02:00
Gina Häußge
8eb61a9926 Switch to pkg_resources for compatibility check
Plugin Manager now internally uses pkg_resources.parse_version and
pkg_resources.parse_requirements to check for version compatibility
with plugins from the repository. That will allow to directly use
the OctoPrint version string once it's PEP440 compatible.
2015-06-29 18:08:34 +02:00
Gina Häußge
a5b87a9067 Updated changelog 2015-06-29 17:49:19 +02:00
Gina Häußge
b3e547c60f Fix: Don't reload page on search form submits
Both file search and plugin repository search reloaded the page when
hitting enter in the search field. This fixes that.
(cherry picked from commit 60043cc)
2015-06-29 17:40:15 +02:00
Gina Häußge
60043ccd1e Fix: Don't reload page on search form submits
Both file search and plugin repository search reloaded the page when
hitting enter in the search field. This fixes that.
2015-06-29 17:39:56 +02:00
Gina Häußge
137db0b17c Updating versioneer & switch to PEP440 versioning 2015-06-29 17:27:15 +02:00
Gina Häußge
1ead6e2d20 Fix: Ensure correct "upload date" for all added files
Local file storage implementation will now "touch" added files to set
modification date to current date, ensuring that files that are just
moved through a custom implementation of file object (e.g. through the
watched folder mechanism) will show with "now" as the upload date.
(cherry picked from commit 5f0c89c)
2015-06-29 10:35:33 +02:00
Gina Häußge
5f0c89c553 Fix: Ensure correct "upload date" for all added files
Local file storage implementation will now "touch" added files to set
modification date to current date, ensuring that files that are just
moved through a custom implementation of file object (e.g. through the
watched folder mechanism) will show with "now" as the upload date.
2015-06-29 10:34:55 +02:00
Gina Häußge
016bdd542a Fix: More flexibility when parsing plugin compatibility
If compatibility information is provided only as a version number it's
prefixed with >= for the check (so stating a compatibility of only
1.2.0 will now make the plugin compatible to all versions that follow
too).

Alternatively the compatibility information may now contain stuff like
">=1.2,<1.3" in which case the plugin will only be shown as compatible
to OctoPrint versions 1.2 and up but not 1.3 or anything above that.
(cherry picked from commit d5692d7)
2015-06-29 10:22:10 +02:00
Gina Häußge
4dc9d0a536 Fix: SD card errors shouldn't not cause disconnect
If the SD card fails to initialize with a volume.init failure, that's
not a reason to break off all diplomatic relations with the printer.
(cherry picked from commit 9caf13d)
2015-06-29 10:19:50 +02:00
Gina Häußge
d5692d797d Fix: More flexibility when parsing plugin compatibility
If compatibility information is provided only as a version number it's
prefixed with >= for the check (so stating a compatibility of only
1.2.0 will now make the plugin compatible to all versions that follow
too).

Alternatively the compatibility information may now contain stuff like
">=1.2,<1.3" in which case the plugin will only be shown as compatible
to OctoPrint versions 1.2 and up but not 1.3 or anything above that.
2015-06-29 10:13:44 +02:00
Gina Häußge
9caf13d620 Fix: SD card errors shouldn't not cause disconnect
If the SD card fails to initialize with a volume.init failure, that's
not a reason to break off all diplomatic relations with the printer.
2015-06-28 16:32:07 +02:00
Gina Häußge
4b11032567 Fix: Slicing profiles now can always be set as default
Previously depended on the slicer being already configured, which is not
really necessary.

Closes #956
(cherry picked from commit 13ac06c)
2015-06-28 02:24:57 +02:00
Gina Häußge
0c54eaf176 Fix: Use Exception, not BaseException
Custom exception should be derived from Exception, not BaseException.

Not only is this specified in the python documentation, but also
tornado will be able to handle Exceptions in requests perfectly fine
and return an HTTP 500 for them, but crash hard (as in, server shut
down follows) for BaseExceptions.
(cherry picked from commit 29b047b)
2015-06-28 02:24:47 +02:00
Gina Häußge
13ac06c6dc Fix: Slicing profiles now can always be set as default
Previously depended on the slicer being already configured, which is not
really necessary.

Closes #956
2015-06-28 02:21:30 +02:00
Gina Häußge
29b047bf09 Fix: Use Exception, not BaseException
Custom exception should be derived from Exception, not BaseException.

Not only is this specified in the python documentation, but also
tornado will be able to handle Exceptions in requests perfectly fine
and return an HTTP 500 for them, but crash hard (as in, server shut
down follows) for BaseExceptions.
2015-06-28 02:19:28 +02:00
Gina Häußge
1796c92913 Fix: Cleanly exit on SIGTERM
(cherry picked from commit 401ebcf)
2015-06-25 15:19:58 +02:00
Gina Häußge
401ebcf685 Fix: Cleanly exit on SIGTERM 2015-06-25 15:18:33 +02:00
Gina Häußge
69e5f137a6 Devel is now 1.3
(cherry picked from commit dd5bf2e)
2015-06-25 11:03:56 +02:00
Gina Häußge
a0f2079fb5 maintenance branch is 1.2.1-dev for now
This branch is for preparing the next patch-releases of the current
stable release on the master branch.
2015-06-25 11:02:33 +02:00
Gina Häußge
dd5bf2e079 Devel is now 1.3 2015-06-25 10:50:54 +02:00
Gina Häußge
198d3450d9 Merge branch 'master' into devel 2015-06-25 10:43:07 +02:00
Gina Häußge
cfa4cb2a7c Preparing 1.2.0 release (forgot another changelog update) 2015-06-25 10:18:00 +02:00
Gina Häußge
12a1bebe7e Preparing 1.2.0 release 2015-06-25 10:13:17 +02:00
Gina Häußge
d461acffc7 Big update of changelog
Resorted some things and added stuff from the various RC release notes.
2015-06-24 15:18:02 +02:00
Gina Häußge
e60cdc9d0f Adjusted bundled plugins to new data folder method 2015-06-24 14:33:33 +02:00
Gina Häußge
67a0fd11dd PluginSettings.get_plugin_data_folder moved to OctoPrintPlugin.get_plugin_data_folder
That way plugins don't need to implement the SettingsPlugin mixin in order to access their data folder, which is now an injected property in OctoPrintPlugin. Plugin authors should still always use the getter since that will also make sure the folder actually does exist (lazy creation).

PluginSettings.get_plugin_data_folder has been marked as deprecated.
2015-06-24 13:59:45 +02:00
Gina Häußge
fca8becb20 More informative errors when serial connection fails 2015-06-24 08:55:27 +02:00
Gina Häußge
be423e49fd Remove dependency_links support again
Doesn't work reliably across pip versions, and adding a special rule for each and every version also isn't fun. Plugin authors will need to use a different approach for pulling in dependencies that are not on pypi during install, e.g. extra install urls or something like that. For now, I give up here ;)
2015-06-23 16:22:45 +02:00
Gina Häußge
5decb23f23 Plugin Manager: color coding call/stdout/stderr in install/uninstall logs 2015-06-23 11:37:07 +02:00
Gina Häußge
ac151d9019 Software Update: Use new PipCaller class and only provide dependency-links parameter if supported by pip version 2015-06-23 11:36:41 +02:00
Gina Häußge
71ccc47717 Plugin Manager: Use new PipCaller class and only provide dependency-links parameter if supported by pip version 2015-06-23 11:36:27 +02:00
Gina Häußge
b32f9bddd2 New util class for performing pip calls
Will lookup the correct pip command to use if not provided as constructor parameter and determine the version. Implements __lt__, __le__, __gt__ and __ge__ for "less/greater than" checks against the pip version, for dynamicalle changing call parameters provided to the execute method based on availability.

 Will allow adjusting software update and plugin manager plugins to only use --process-dependency-links for pip versions >= 1.5
2015-06-23 11:35:23 +02:00
Gina Häußge
1a7193e113 System commands with ignore set to true also ignore http errors 2015-06-22 16:55:32 +02:00
Gina Häußge
a580482c29 Allow asynchronous system commands & commands w/ ignored result
That should get rid of error messages for things like shutdown commands.
2015-06-22 14:28:05 +02:00
Gina Häußge
f00248bc4d Merge branch 'master' into devel 2015-06-22 13:19:49 +02:00
Gina Häußge
e230cfb3f3 Software Update fix: Use pip command line instead of module 2015-06-22 13:07:22 +02:00
Gina Häußge
030b6b4478 Software Update: version cache will be written to disk
Reduces number of requests done against (rate limited) github API, especially after consecutive server restarts. Forcing the update check still will query the API.
2015-06-22 13:05:03 +02:00
Gina Häußge
0f818a313d Software Update: Default to pkg_resources for version comparison
That's also able to cope with 0.3a and similar "non-semantic" version schemes. Semantic version comparison can still be forced by setting the compare_type in the check to "semantic". Strict equality check can be set similarly by using the value "unequal".
2015-06-22 13:03:23 +02:00
Gina Häußge
326fc943b7 Plugin Manager: Cache repository list locally
Reduces requests against github upon server restarts.
2015-06-22 13:00:29 +02:00