From 2ca24d2c6a929cc0655d09c4c63f4d3783644601 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Tue, 16 Jan 2018 14:47:50 -0800 Subject: [PATCH] Update macOS build instructions and pip dependency versions, and also update stem for Windows as well --- BUILD.md | 6 +++--- install/requirements-windows.txt | 2 +- install/requirements.txt | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/BUILD.md b/BUILD.md index db026f7e..588685d0 100644 --- a/BUILD.md +++ b/BUILD.md @@ -32,11 +32,11 @@ For ArchLinux: There is a PKBUILD available [here](https://aur.archlinux.org/pac ## Mac OS X -Install Xcode from the Mac App Store. Once it's installed, run it for the first time to set it up. +Install Xcode from the Mac App Store. Once it's installed, run it for the first time to set it up. Also, run this to make sure command line tools are installed: `xcode-select --install`. And finally, open Xcode, go to Preferences > Locations, and make sure under Command Line Tools you select an installed version from the dropdown. (This is required for installing Qt5.) -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`. +Download and install Python 3.6.4 from https://www.python.org/downloads/release/python-364/. I downloaded `python-3.6.4-macosx10.6.pkg`. -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.) +Download and install Qt5 from https://www.qt.io/download-open-source/. I downloaded `qt-unified-mac-x64-3.0.2-online.dmg`. There's no need to login to a Qt account during installation. Make sure you install the latest Qt 5.x. I installed Qt 5.10.0 -- all you need is to check `Qt > Qt 5.10.0 > macOS`. Now install some python dependencies with pip (note, there's issues building a .app if you install this in a virtualenv): diff --git a/install/requirements-windows.txt b/install/requirements-windows.txt index 89bd8158..32b8da4a 100644 --- a/install/requirements-windows.txt +++ b/install/requirements-windows.txt @@ -9,5 +9,5 @@ PyInstaller==3.3.1 PyQt5==5.9.2 PySocks==1.6.7 sip==4.19.6 -stem==1.5.4 +stem==1.6.0 Werkzeug==0.14.1 diff --git a/install/requirements.txt b/install/requirements.txt index a046504a..c7828080 100644 --- a/install/requirements.txt +++ b/install/requirements.txt @@ -1,11 +1,11 @@ click==6.7 -Flask==0.12 +Flask==0.12.2 itsdangerous==0.24 -Jinja2==2.9.5 -MarkupSafe==0.23 -PyInstaller==3.2.1 -PyQt5==5.7.1 +Jinja2==2.10 +MarkupSafe==1.0 +PyInstaller==3.3.1 +PyQt5==5.9.2 PySocks==1.6.7 -sip==4.19 -stem==1.5.4 -Werkzeug==0.11.15 +sip==4.19.6 +stem==1.6.0 +Werkzeug==0.14.1