diff --git a/Dockerfile b/Dockerfile index de20ef376..ca213f1de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +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.0" \ +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 919d8b7da..3cdbbb3f6 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" +pip install -U wheel "numpy<3" pip install --only-binary ta-lib --find-links=build_helpers\ ta-lib pip install -r requirements-dev.txt diff --git a/build_helpers/ta_lib-0.4.38-cp310-cp310-win_amd64.whl b/build_helpers/ta_lib-0.4.38-cp310-cp310-win_amd64.whl deleted file mode 100644 index 00610d687..000000000 Binary files a/build_helpers/ta_lib-0.4.38-cp310-cp310-win_amd64.whl and /dev/null differ diff --git a/build_helpers/ta_lib-0.4.38-cp311-cp311-linux_armv7l.whl b/build_helpers/ta_lib-0.4.38-cp311-cp311-linux_armv7l.whl deleted file mode 100644 index a255164d0..000000000 Binary files a/build_helpers/ta_lib-0.4.38-cp311-cp311-linux_armv7l.whl and /dev/null differ diff --git a/build_helpers/ta_lib-0.4.38-cp311-cp311-win_amd64.whl b/build_helpers/ta_lib-0.4.38-cp311-cp311-win_amd64.whl deleted file mode 100644 index 7237604ba..000000000 Binary files a/build_helpers/ta_lib-0.4.38-cp311-cp311-win_amd64.whl and /dev/null differ diff --git a/build_helpers/ta_lib-0.4.38-cp312-cp312-win_amd64.whl b/build_helpers/ta_lib-0.4.38-cp312-cp312-win_amd64.whl deleted file mode 100644 index fe37c8468..000000000 Binary files a/build_helpers/ta_lib-0.4.38-cp312-cp312-win_amd64.whl and /dev/null differ diff --git a/build_helpers/ta_lib-0.5.4-cp310-cp310-win_amd64.whl b/build_helpers/ta_lib-0.5.4-cp310-cp310-win_amd64.whl new file mode 100644 index 000000000..287ca7191 Binary files /dev/null and b/build_helpers/ta_lib-0.5.4-cp310-cp310-win_amd64.whl differ diff --git a/build_helpers/ta_lib-0.5.4-cp311-cp311-linux_armv7l.whl b/build_helpers/ta_lib-0.5.4-cp311-cp311-linux_armv7l.whl new file mode 100644 index 000000000..69b54287a Binary files /dev/null and b/build_helpers/ta_lib-0.5.4-cp311-cp311-linux_armv7l.whl differ diff --git a/build_helpers/ta_lib-0.5.4-cp311-cp311-win_amd64.whl b/build_helpers/ta_lib-0.5.4-cp311-cp311-win_amd64.whl new file mode 100644 index 000000000..794bdc797 Binary files /dev/null and b/build_helpers/ta_lib-0.5.4-cp311-cp311-win_amd64.whl differ diff --git a/build_helpers/ta_lib-0.5.4-cp312-cp312-win_amd64.whl b/build_helpers/ta_lib-0.5.4-cp312-cp312-win_amd64.whl new file mode 100644 index 000000000..801ba7dc9 Binary files /dev/null and b/build_helpers/ta_lib-0.5.4-cp312-cp312-win_amd64.whl differ diff --git a/build_helpers/ta_lib-0.5.4-cp313-cp313-win_amd64.whl b/build_helpers/ta_lib-0.5.4-cp313-cp313-win_amd64.whl new file mode 100644 index 000000000..df6343a76 Binary files /dev/null and b/build_helpers/ta_lib-0.5.4-cp313-cp313-win_amd64.whl differ diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index 9ae810a26..d4eb77da1 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" \ +RUN pip install --user --no-cache-dir "numpy<3" \ && pip install --user --no-index --find-links /tmp/ pyarrow TA-Lib \ && pip install --user --no-cache-dir -r requirements.txt diff --git a/freqtrade/templates/__init__.py b/freqtrade/templates/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/pyproject.toml b/pyproject.toml index 998896937..c3ef5f1fc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,10 +38,10 @@ dependencies = [ "httpx>=0.24.1", "urllib3", "jsonschema", - "numpy<2.0", + "numpy>2.0,<3.0", "pandas>=2.2.0,<3.0", "TA-Lib", - "pandas-ta", + "ft-pandas-ta", "technical", "tabulate", "pycoingecko>=3.2.0", @@ -207,6 +207,14 @@ plugins = [ module = "tests.*" ignore_errors = true +[[tool.mypy.overrides]] +module = [ + "freqtrade.templates.*", + "tests.strategy.strats" +] +# Disable attr-defined check due to ta-lib not having type stubs +disable_error_code = "attr-defined" + [tool.pyright] include = ["freqtrade", "ft_client"] exclude = [ diff --git a/requirements-freqai-rl.txt b/requirements-freqai-rl.txt index 61333c6f9..11190a5f0 100644 --- a/requirements-freqai-rl.txt +++ b/requirements-freqai-rl.txt @@ -5,7 +5,6 @@ torch==2.7.0; sys_platform != 'darwin' or platform_machine != 'x86_64' gymnasium==0.29.1 # SB3 >=2.5.0 depends on torch 2.3.0 - which implies it dropped support x86 macos -stable_baselines3==2.4.1; sys_platform == 'darwin' and platform_machine == 'x86_64' stable_baselines3==2.5.0; sys_platform != 'darwin' or platform_machine != 'x86_64' sb3_contrib>=2.2.1 # Progress bar for stable-baselines3 and sb3-contrib diff --git a/requirements.txt b/requirements.txt index 33c7eabd5..f9a874851 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -numpy==1.26.4 +numpy==2.2.6 pandas==2.2.3 bottleneck==1.4.2 numexpr==2.10.2 -pandas-ta==0.3.14b +ft-pandas-ta==0.3.15 ccxt==4.4.85 cryptography==45.0.3 @@ -17,7 +17,7 @@ requests==2.32.3 urllib3==2.4.0 certifi==2025.4.26 jsonschema==4.23.0 -TA-Lib==0.4.38 +ta-lib==0.5.4 technical==1.5.0 tabulate==0.9.0 pycoingecko==3.2.0 diff --git a/tests/strategy/strats/__init__.py b/tests/strategy/strats/__init__.py new file mode 100644 index 000000000..e69de29bb