From e80b775bf6730ecbec6507e24303b91d1d8e7403 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 21 Feb 2017 14:10:44 -0800 Subject: [PATCH] Update macOS build instructions, and install pip deps from a requirements.txt --- BUILD.md | 24 ++++++------------------ install/requirements.txt | 2 ++ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/BUILD.md b/BUILD.md index 31f36e80..a0ca80cb 100644 --- a/BUILD.md +++ b/BUILD.md @@ -34,29 +34,17 @@ For ArchLinux: There is a PKBUILD available [here](https://aur.archlinux.org/pac Install Xcode from the Mac App Store. Once it's installed, run it for the first time to set it up. -If you don't already have it installed, install [Homebrew](http://brew.sh/). +Download and install Python 3.5.2 from https://www.python.org/downloads/release/python-352/ (note that a pyinstaller bug prevents you from using Python 3.6). I downloaded `python-3.5.2-macosx10.6.pkg`. -Install some dependencies using Homebrew: +Download and install Qt 5.7.1 for macOS offline installer from https://www.qt.io/download-open-source/. I downloaded `qt-opensource-mac-x64-clang-5.7.1.dmg`. (You can skip making an account in the installer.) + +Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv): ```sh -brew install python3 pyqt5 qt5 +sudo pip3 install -r install/requirements.txt ``` -Set up a virtual env (`sudo pip3 install virtualenv` if you don't have it installed): - -```sh -$ virtualenv env -$ . env/bin/activate -(env) pip3 install -r install/requirements.txt -``` - -Install some dependencies using pip3: - -```sh -sudo pip3 install flask stem pyinstaller -``` - -After that you can try both the CLI and the GUI version of OnionShare: +You can run both the CLI and GUI versions of OnionShare without building an bundle: ```sh ./dev_scripts/onionshare diff --git a/install/requirements.txt b/install/requirements.txt index 4137c61f..9788289f 100644 --- a/install/requirements.txt +++ b/install/requirements.txt @@ -4,5 +4,7 @@ itsdangerous==0.24 Jinja2==2.9.2 MarkupSafe==0.23 PyInstaller==3.2 +PyQt5==5.7.1 +sip==4.19 stem==1.5.4 Werkzeug==0.11.15