From f443b1426f459c78b9aa9e1f69fceba6c1f34fcb Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 8 Nov 2024 07:03:03 +0100 Subject: [PATCH 1/4] chore: try removing all brew install steps (hdf5 provides proper wheels now) --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0569e6d7a..6143e4865 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,29 +174,29 @@ jobs: run: | cd build_helpers && ./install_ta-lib.sh ${HOME}/dependencies/; cd .. - - name: Installation - macOS (Brew) - run: | - # brew update - # TODO: Should be the brew upgrade - # homebrew fails to update python due to unlinking failures - # https://github.com/actions/runner-images/issues/6817 - rm /usr/local/bin/2to3 || true - rm /usr/local/bin/2to3-3.11 || true - rm /usr/local/bin/2to3-3.12 || true - rm /usr/local/bin/idle3 || true - rm /usr/local/bin/idle3.11 || true - rm /usr/local/bin/idle3.12 || true - rm /usr/local/bin/pydoc3 || true - rm /usr/local/bin/pydoc3.11 || true - rm /usr/local/bin/pydoc3.12 || true - rm /usr/local/bin/python3 || true - rm /usr/local/bin/python3.11 || true - rm /usr/local/bin/python3.12 || true - rm /usr/local/bin/python3-config || true - rm /usr/local/bin/python3.11-config || true - rm /usr/local/bin/python3.12-config || true + # - name: Installation - macOS (Brew) + # run: | + # # brew update + # # TODO: Should be the brew upgrade + # # homebrew fails to update python due to unlinking failures + # # https://github.com/actions/runner-images/issues/6817 + # rm /usr/local/bin/2to3 || true + # rm /usr/local/bin/2to3-3.11 || true + # rm /usr/local/bin/2to3-3.12 || true + # rm /usr/local/bin/idle3 || true + # rm /usr/local/bin/idle3.11 || true + # rm /usr/local/bin/idle3.12 || true + # rm /usr/local/bin/pydoc3 || true + # rm /usr/local/bin/pydoc3.11 || true + # rm /usr/local/bin/pydoc3.12 || true + # rm /usr/local/bin/python3 || true + # rm /usr/local/bin/python3.11 || true + # rm /usr/local/bin/python3.12 || true + # rm /usr/local/bin/python3-config || true + # rm /usr/local/bin/python3.11-config || true + # rm /usr/local/bin/python3.12-config || true - brew install hdf5 c-blosc libomp + # brew install hdf5 c-blosc libomp - name: Installation (python) run: | From 37c00d4eeb687bfba0ecf2fa128bc7f4eafe684b Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 8 Nov 2024 07:59:47 +0100 Subject: [PATCH 2/4] chore: keep libomp brew install --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6143e4865..12524ae01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,29 +174,29 @@ jobs: run: | cd build_helpers && ./install_ta-lib.sh ${HOME}/dependencies/; cd .. - # - name: Installation - macOS (Brew) - # run: | - # # brew update - # # TODO: Should be the brew upgrade - # # homebrew fails to update python due to unlinking failures - # # https://github.com/actions/runner-images/issues/6817 - # rm /usr/local/bin/2to3 || true - # rm /usr/local/bin/2to3-3.11 || true - # rm /usr/local/bin/2to3-3.12 || true - # rm /usr/local/bin/idle3 || true - # rm /usr/local/bin/idle3.11 || true - # rm /usr/local/bin/idle3.12 || true - # rm /usr/local/bin/pydoc3 || true - # rm /usr/local/bin/pydoc3.11 || true - # rm /usr/local/bin/pydoc3.12 || true - # rm /usr/local/bin/python3 || true - # rm /usr/local/bin/python3.11 || true - # rm /usr/local/bin/python3.12 || true - # rm /usr/local/bin/python3-config || true - # rm /usr/local/bin/python3.11-config || true - # rm /usr/local/bin/python3.12-config || true + - name: Installation - macOS (Brew) + run: | + # brew update + # TODO: Should be the brew upgrade + # homebrew fails to update python due to unlinking failures + # https://github.com/actions/runner-images/issues/6817 + rm /usr/local/bin/2to3 || true + rm /usr/local/bin/2to3-3.11 || true + rm /usr/local/bin/2to3-3.12 || true + rm /usr/local/bin/idle3 || true + rm /usr/local/bin/idle3.11 || true + rm /usr/local/bin/idle3.12 || true + rm /usr/local/bin/pydoc3 || true + rm /usr/local/bin/pydoc3.11 || true + rm /usr/local/bin/pydoc3.12 || true + rm /usr/local/bin/python3 || true + rm /usr/local/bin/python3.11 || true + rm /usr/local/bin/python3.12 || true + rm /usr/local/bin/python3-config || true + rm /usr/local/bin/python3.11-config || true + rm /usr/local/bin/python3.12-config || true - # brew install hdf5 c-blosc libomp + brew install libomp - name: Installation (python) run: | From c141b873c31b262bc71339559f7bf891ebd06220 Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Nov 2024 08:24:37 +0100 Subject: [PATCH 3/4] docs: Update install docs --- docs/installation.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 02cbb7f3e..9c83d099a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -76,7 +76,7 @@ OS Specific steps are listed first, the common section below is necessary for al ```bash sudo apt-get install python3-venv libatlas-base-dev cmake curl - # Use pywheels.org to speed up installation + # Use piwheels.org to speed up installation sudo echo "[global]\nextra-index-url=https://www.piwheels.org/simple" > tee /etc/pip.conf git clone https://github.com/freqtrade/freqtrade.git @@ -220,7 +220,7 @@ cd .. rm -rf ./ta-lib* ``` -#### Setup Python virtual environment (virtualenv) +### Setup Python virtual environment (virtualenv) You will run freqtrade in separated `virtual environment` @@ -232,7 +232,7 @@ python3 -m venv .venv source .venv/bin/activate ``` -#### Install python dependencies +### Install python dependencies ```bash python3 -m pip install --upgrade pip @@ -242,9 +242,9 @@ python3 -m pip install -e . ### Congratulations -[You are ready](#you-are-ready), and run the bot +[You are now ready](#you-are-ready), and run the bot -#### (Optional) Post-installation Tasks +### (Optional) Post-installation Tasks !!! Note If you run the bot on a server, you should consider using [Docker](docker_quickstart.md) or a terminal multiplexer like `screen` or [`tmux`](https://en.wikipedia.org/wiki/Tmux) to avoid that the bot is stopped on logout. From 0e04f79b6d4c09c98cee0e04e61c6a0f54abe48a Mon Sep 17 00:00:00 2001 From: Matthias Date: Sat, 9 Nov 2024 08:30:19 +0100 Subject: [PATCH 4/4] docs: add macos libomp to docs closes #10900 --- docs/installation.md | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 9c83d099a..30deb07ba 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -67,6 +67,18 @@ OS Specific steps are listed first, the common section below is necessary for al sudo apt install -y python3-pip python3-venv python3-dev python3-pandas git curl ``` +=== "MacOS" + #### Install necessary dependencies + + Install [Homebrew](https://brew.sh/) if you don't have it already. + + ```bash + # install packages + brew install gettext libomp + ``` + !!! Note + The `setup.sh` script will install these dependencies for you - assuming brew is installed on your system. + === "RaspberryPi/Raspbian" The following assumes the latest [Raspbian Buster lite image](https://www.raspberrypi.org/downloads/raspbian/). This image comes with python3.11 preinstalled, making it easy to get freqtrade up and running. @@ -150,9 +162,7 @@ Each time you open a new terminal, you must run `source .venv/bin/activate` to a source ./.venv/bin/activate ``` -### Congratulations - -[You are ready](#you-are-ready), and run the bot +[You are now ready](#you-are-ready) to run the bot. ### Other options of /setup.sh script @@ -237,12 +247,11 @@ source .venv/bin/activate ```bash python3 -m pip install --upgrade pip python3 -m pip install -r requirements.txt +# install freqtrade python3 -m pip install -e . ``` -### Congratulations - -[You are now ready](#you-are-ready), and run the bot +[You are now ready](#you-are-ready) to run the bot. ### (Optional) Post-installation Tasks @@ -333,9 +342,7 @@ cd build_helpers bash install_ta-lib.sh ${CONDA_PREFIX} nosudo ``` -### Congratulations - -[You are ready](#you-are-ready), and run the bot +[You are now ready](#you-are-ready) to run the bot. ### Important shortcuts