Simplified install process on Mac

(cherry picked from commit 726eec8)
This commit is contained in:
Noah Martin 2017-01-11 23:22:21 +01:00 committed by Gina Häußge
parent 20cd13904d
commit b1057a4cc8
4 changed files with 6 additions and 7 deletions

View file

@ -55,3 +55,4 @@
* [SockJS-Tornado](http://github.com/mrjoes/sockjs-tornado/): MIT * [SockJS-Tornado](http://github.com/mrjoes/sockjs-tornado/): MIT
* [Tornado](http://www.tornadoweb.org/): Apache License 2.0 * [Tornado](http://www.tornadoweb.org/): Apache License 2.0
* [watchdog](http://github.com/gorakhargosh/watchdog): Apache License 2.0 * [watchdog](http://github.com/gorakhargosh/watchdog): Apache License 2.0
* [appdirs](http://github.com/ActiveState/appdirs): MIT

View file

@ -145,7 +145,6 @@ You'll need a user account with administrator privileges.
cd OctoPrint cd OctoPrint
virtualenv venv virtualenv venv
source venv/bin/activate source venv/bin/activate
pip install -U pyobjc
pip install -e .[develop] pip install -e .[develop]
You can then start OctoPrint via ``~/devel/OctoPrint/venv/bin/octoprint`` or just ``octoprint`` if you activated the virtual You can then start OctoPrint via ``~/devel/OctoPrint/venv/bin/octoprint`` or just ``octoprint`` if you activated the virtual

View file

@ -50,6 +50,9 @@ INSTALL_REQUIRES = [
"websocket-client>=0.40,<0.41" "websocket-client>=0.40,<0.41"
] ]
if sys.platform == "darwin":
INSTALL_REQUIRES.append("appdirs>=1.4.0")
# Additional requirements for optional install options # Additional requirements for optional install options
EXTRA_REQUIRES = dict( EXTRA_REQUIRES = dict(
# Dependencies for developing OctoPrint # Dependencies for developing OctoPrint

View file

@ -1490,12 +1490,8 @@ class Settings(object):
def _default_basedir(applicationName): def _default_basedir(applicationName):
# taken from http://stackoverflow.com/questions/1084697/how-do-i-store-desktop-application-data-in-a-cross-platform-way-for-python # taken from http://stackoverflow.com/questions/1084697/how-do-i-store-desktop-application-data-in-a-cross-platform-way-for-python
if sys.platform == "darwin": if sys.platform == "darwin":
from AppKit import NSSearchPathForDirectoriesInDomains from appdirs import *
# http://developer.apple.com/DOCUMENTATION/Cocoa/Reference/Foundation/Miscellaneous/Foundation_Functions/Reference/reference.html#//apple_ref/c/func/NSSearchPathForDirectoriesInDomains return user_data_dir(applicationName, "")
# NSApplicationSupportDirectory = 14
# NSUserDomainMask = 1
# True for expanding the tilde into a fully qualified path
return os.path.join(NSSearchPathForDirectoriesInDomains(14, 1, True)[0], applicationName)
elif sys.platform == "win32": elif sys.platform == "win32":
return os.path.join(os.environ["APPDATA"], applicationName) return os.path.join(os.environ["APPDATA"], applicationName)
else: else: