From 6b88c49e0a068d1ceaf1c89178431315ca5ad550 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 9 Jun 2025 09:22:10 +0200 Subject: [PATCH] chore: revert ta-lib install workarounds --- .github/workflows/ci.yml | 10 ---------- Dockerfile | 4 +--- build_helpers/install_windows.ps1 | 2 +- docker/Dockerfile.armhf | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 257890ae3..263ad5db7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,12 +65,9 @@ jobs: export LD_LIBRARY_PATH=${HOME}/dependencies/lib:$LD_LIBRARY_PATH export TA_LIBRARY_PATH=${HOME}/dependencies/lib export TA_INCLUDE_PATH=${HOME}/dependencies/include - echo "numpy<2.3.0" > constraints.txt - export UV_BUILD_CONSTRAINT=constraints.txt uv pip install -r requirements-dev.txt uv pip install -e ft_client/ uv pip install -e . - rm constraints.txt - name: Check for version alignment run: | @@ -231,12 +228,9 @@ jobs: export LD_LIBRARY_PATH=${HOME}/dependencies/lib:$LD_LIBRARY_PATH export TA_LIBRARY_PATH=${HOME}/dependencies/lib export TA_INCLUDE_PATH=${HOME}/dependencies/include - echo "numpy<2.3.0" > constraints.txt - export UV_BUILD_CONSTRAINT=constraints.txt uv pip install -r requirements-dev.txt uv pip install -e ft_client/ uv pip install -e . - rm constraints.txt - name: Tests run: | @@ -486,13 +480,9 @@ jobs: export LD_LIBRARY_PATH=${HOME}/dependencies/lib:$LD_LIBRARY_PATH export TA_LIBRARY_PATH=${HOME}/dependencies/lib export TA_INCLUDE_PATH=${HOME}/dependencies/include - echo "numpy<2.3.0" > constraints.txt - export UV_BUILD_CONSTRAINT=constraints.txt uv pip install -r requirements-dev.txt uv pip install -e ft_client/ uv pip install -e . - rm constraints.txt - - name: Tests incl. ccxt compatibility tests env: diff --git a/Dockerfile b/Dockerfile index ec7dca342..edc35b474 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,9 +35,7 @@ ENV LD_LIBRARY_PATH /usr/local/lib # Install dependencies COPY --chown=ftuser:ftuser requirements.txt requirements-hyperopt.txt /freqtrade/ USER ftuser -RUN pip install --user --no-cache-dir "numpy<2.3.0" \ - && echo "numpy<2.3.0" > /tmp/constraints.txt \ - && export PIP_CONSTRAINT=/tmp/constraints.txt \ +RUN pip install --user --no-cache-dir "numpy<3.0" \ && pip install --user --no-cache-dir -r requirements-hyperopt.txt # Copy dependencies to runtime-image diff --git a/build_helpers/install_windows.ps1 b/build_helpers/install_windows.ps1 index 99f4de025..aa2ec3655 100644 --- a/build_helpers/install_windows.ps1 +++ b/build_helpers/install_windows.ps1 @@ -3,7 +3,7 @@ python -m pip install --upgrade pip python -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')" -pip install -U wheel "numpy<2.3" +pip install -U wheel "numpy<3.0" pip install --only-binary ta-lib --find-links=build_helpers\ ta-lib pip install -r requirements-dev.txt diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index 6167c0d07..a7edd5e76 100644 --- a/docker/Dockerfile.armhf +++ b/docker/Dockerfile.armhf @@ -34,7 +34,7 @@ COPY build_helpers/* /tmp/ # Install dependencies COPY --chown=ftuser:ftuser requirements.txt /freqtrade/ USER ftuser -RUN pip install --user --no-cache-dir "numpy<2.3.0" \ +RUN pip install --user --no-cache-dir "numpy<3.0" \ && pip install --user --no-index --find-links /tmp/ pyarrow TA-Lib \ && pip install --user --no-cache-dir -r requirements.txt