Moved octoprint sources to "src" folder, adjusted setup.py and run script accordingly

MANIFEST.in

@@ -1,2 +1,2 @@
-recursive-include octoprint/static *
-recursive-include octoprint/templates *
+recursive-include src/octoprint/static *
+recursive-include src/octoprint/templates *

octoprint/__init__.py

@@ -1 +0,0 @@
-

requirements-bbb.txt

@@ -6,3 +6,5 @@ PyYAML==3.10
 Flask-Login==0.2.2
 Flask-Principal==0.3.5
 netaddr>=0.7.10
+mock>=1.0.1
+nose>=1.3.0

requirements.txt

@@ -5,7 +5,6 @@ sockjs-tornado>=1.0.0
 PyYAML==3.10
 Flask-Login==0.2.2
 Flask-Principal==0.3.5
-numpy>=1.6.2
 pyserial>=2.6
 netaddr>=0.7.10
 mock>=1.0.1

run

@@ -1,65 +1,16 @@
 #!/usr/bin/env python
+
+print """
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!! You are using an old startup method for OctoPrint. !!!
+!!! Please perform 'sudo python setup.py install' and  !!!
+!!! use the 'octoprint' executable instead.            !!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+"""
+
 import sys
-from octoprint.daemon import Daemon
-from octoprint.server import Server
+sys.path.append("src")
 
-class Main(Daemon):
-	def __init__(self, pidfile, configfile, basedir, host, port, debug):
-		Daemon.__init__(self, pidfile)
-
-		self._configfile = configfile
-		self._basedir = basedir
-		self._host = host
-		self._port = port
-		self._debug = debug
-
-	def run(self):
-		octoprint = Server(self._configfile, self._basedir, self._host, self._port, self._debug)
-		octoprint.run()
-
-def main():
-	import argparse
-
-	parser = argparse.ArgumentParser(prog="run")
-
-	parser.add_argument("-d", "--debug", action="store_true", dest="debug",
-		help="Enable debug mode")
-
-	parser.add_argument("--host", action="store", type=str, dest="host",
-		help="Specify the host on which to bind the server")
-	parser.add_argument("--port", action="store", type=int, dest="port",
-		help="Specify the port on which to bind the server")
-
-	parser.add_argument("-c", "--config", action="store", dest="config",
-		help="Specify the config file to use. OctoPrint needs to have write access for the settings dialog to work. Defaults to ~/.octoprint/config.yaml")
-	parser.add_argument("-b", "--basedir", action="store", dest="basedir",
-		help="Specify the basedir to use for uploads, timelapses etc. OctoPrint needs to have write access. Defaults to ~/.octoprint")
-
-	parser.add_argument("--daemon", action="store", type=str, choices=["start", "stop", "restart"],
-		help="Daemonize/control daemonized OctoPrint instance (only supported under Linux right now)")
-	parser.add_argument("--pid", action="store", type=str, dest="pidfile", default="/tmp/octoprint.pid",
-		help="Pidfile to use for daemonizing, defaults to /tmp/octoprint.pid")
-
-	parser.add_argument("--iknowwhatimdoing", action="store_true", dest="allowRoot",
-		help="Allow OctoPrint to run as user root")
-
-	args = parser.parse_args()
-
-	if args.daemon:
-		if sys.platform == "darwin" or sys.platform == "win32":
-			print >> sys.stderr, "Sorry, daemon mode is only supported under Linux right now"
-			sys.exit(2)
-
-		daemon = Main(args.pidfile, args.config, args.basedir, args.host, args.port, args.debug)
-		if "start" == args.daemon:
-			daemon.start()
-		elif "stop" == args.daemon:
-			daemon.stop()
-		elif "restart" == args.daemon:
-			daemon.restart()
-	else:
-		octoprint = Server(args.config, args.basedir, args.host, args.port, args.debug, args.allowRoot)
-		octoprint.run()
-
-if __name__ == "__main__":
-	main()
+import octoprint
+octoprint.main()

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "0.1.0"
+VERSION = "1.1.0-dev"
 
 def params():
 	name = "OctoPrint"
@@ -34,11 +34,23 @@ def params():
 	url = "http://octoprint.org"
 	license = "AGPLv3"
 
-	packages = find_packages()
+	packages = find_packages(where="src")
+	package_dir = {"octoprint": "src/octoprint"}
+
 	include_package_data = True
 	zip_safe = False
 	install_requires = open("requirements.txt").read().split("\n")
 
+	entry_points = {
+		"console_scripts": [
+			"octoprint = octoprint:main"
+		]
+	}
+
+	#scripts = {
+	#	"scripts/octoprint.init": "/etc/init.d/octoprint"
+	#}
+
 	return locals()
 
 setup(**params())

src/octoprint/__init__.py

@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+import sys
+from octoprint.daemon import Daemon
+from octoprint.server import Server
+
+class Main(Daemon):
+	def __init__(self, pidfile, configfile, basedir, host, port, debug):
+		Daemon.__init__(self, pidfile)
+
+		self._configfile = configfile
+		self._basedir = basedir
+		self._host = host
+		self._port = port
+		self._debug = debug
+
+	def run(self):
+		octoprint = Server(self._configfile, self._basedir, self._host, self._port, self._debug)
+		octoprint.run()
+
+def main():
+	import argparse
+
+	parser = argparse.ArgumentParser(prog="run")
+
+	parser.add_argument("-d", "--debug", action="store_true", dest="debug",
+						help="Enable debug mode")
+
+	parser.add_argument("--host", action="store", type=str, dest="host",
+						help="Specify the host on which to bind the server")
+	parser.add_argument("--port", action="store", type=int, dest="port",
+						help="Specify the port on which to bind the server")
+
+	parser.add_argument("-c", "--config", action="store", dest="config",
+						help="Specify the config file to use. OctoPrint needs to have write access for the settings dialog to work. Defaults to ~/.octoprint/config.yaml")
+	parser.add_argument("-b", "--basedir", action="store", dest="basedir",
+						help="Specify the basedir to use for uploads, timelapses etc. OctoPrint needs to have write access. Defaults to ~/.octoprint")
+
+	parser.add_argument("--daemon", action="store", type=str, choices=["start", "stop", "restart"],
+						help="Daemonize/control daemonized OctoPrint instance (only supported under Linux right now)")
+	parser.add_argument("--pid", action="store", type=str, dest="pidfile", default="/tmp/octoprint.pid",
+						help="Pidfile to use for daemonizing, defaults to /tmp/octoprint.pid")
+
+	parser.add_argument("--iknowwhatimdoing", action="store_true", dest="allowRoot",
+						help="Allow OctoPrint to run as user root")
+
+	args = parser.parse_args()
+
+	if args.daemon:
+		if sys.platform == "darwin" or sys.platform == "win32":
+			print >> sys.stderr, "Sorry, daemon mode is only supported under Linux right now"
+			sys.exit(2)
+
+		daemon = Main(args.pidfile, args.config, args.basedir, args.host, args.port, args.debug)
+		if "start" == args.daemon:
+			daemon.start()
+		elif "stop" == args.daemon:
+			daemon.stop()
+		elif "restart" == args.daemon:
+			daemon.restart()
+	else:
+		octoprint = Server(args.config, args.basedir, args.host, args.port, args.debug, args.allowRoot)
+		octoprint.run()
+
+if __name__ == "__main__":
+	main()
+