SW-1275 merge beta to mrbeam2-beta

SW-1245 release 0.11.0b0
mrbeam · May 12, 2022 · 2295018 · 2295018
2 parents dc0dc17 + 8756aa3
commit 2295018
Show file tree

Hide file tree

Showing 15 changed files with 3,061 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+octoprint_netconnectd/_version.py export-subst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,3 +4,6 @@ recursive-include octoprint_netconnectd/translations *
 include LICENSE
 include requirements.txt
 include README.md
+include versioneer.py
+include octoprint_netconnectd/_version.py
+graft octoprint_netconnectd/scripts
diff --git a/octoprint_netconnectd/__init__.py b/octoprint_netconnectd/__init__.py
@@ -374,3 +374,8 @@ def __plugin_load__():
     global __plugin_implementation__
     __plugin_implementation__ = NetconnectdSettingsPlugin()
     return True
+
+
+from ._version import get_versions
+__version__ = get_versions()['version']
+del get_versions
diff --git a/octoprint_netconnectd/__version.py b/octoprint_netconnectd/__version.py
@@ -0,0 +1 @@
+__version__ = "0.1.10" #TODO fix with versioneer