Merge remote-tracking branch 'origin/Beta' into Beta

This commit is contained in:
David Zingg 2020-07-01 21:59:54 +02:00
commit 107a7ba9de
2 changed files with 4 additions and 1 deletions

View File

@ -429,6 +429,7 @@ class MyStromSwitchPlugin(octoprint.plugin.SettingsPlugin,
__plugin_name__ = "MyStrom Switch" __plugin_name__ = "MyStrom Switch"
__plugin_pythoncompat__ = ">=2.7,<4"
def __plugin_load__(): def __plugin_load__():

View File

@ -57,7 +57,9 @@ plugin_ignored_packages = []
# Example: # Example:
# plugin_requires = ["someDependency==dev"] # plugin_requires = ["someDependency==dev"]
# additional_setup_parameters = {"dependency_links": ["https://github.com/someUser/someRepo/archive/master.zip#egg=someDependency-dev"]} # additional_setup_parameters = {"dependency_links": ["https://github.com/someUser/someRepo/archive/master.zip#egg=someDependency-dev"]}
additional_setup_parameters = {} additional_setup_parameters = {
"use_2to3": True,
}
######################################################################################################################## ########################################################################################################################