Merge remote-tracking branch 'origin/TheWCKD-1s_timeframe_feature' in…

…to develop # Conflicts: # .github/workflows/docker_update_readme.yml # docker/Dockerfile.armhf # docs/requirements-docs.txt # requirements.txt
xsa-dev · Apr 4, 2024 · 6239def · 6239def
2 parents 859cac0 + 6cea9ea
commit 6239def
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 27 deletions.
diff --git a/.github/workflows/docker_update_readme.yml b/.github/workflows/docker_update_readme.yml
@@ -0,0 +1,17 @@
+name: Update Docker Hub Description
+on:
+  push:
+    branches:
+    - stable
+
+jobs:
+  dockerHubDescription:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Docker Hub Description
+      uses: peter-evans/dockerhub-description@v4
+      env:
+        DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        DOCKERHUB_REPOSITORY: freqtradeorg/freqtrade
diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM python:3.11.8-slim-bookworm as base
+FROM python:3.12.0b4-slim-bullseye as base
 
 # Setup env
 ENV LANG C.UTF-8

diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
@@ -1,6 +1,6 @@
-markdown==3.6
+markdown==3.5.2
 mkdocs==1.5.3
-mkdocs-material==9.5.16
+mkdocs-material==9.5.3
 mdx_truly_sane_lists==1.3
-pymdown-extensions==10.7.1
+pymdown-extensions==10.5
 jinja2==3.1.3
diff --git a/requirements-freqai.txt b/requirements-freqai.txt
@@ -10,3 +10,8 @@ lightgbm==4.3.0
 xgboost==2.0.3
 tensorboard==2.16.2
 datasieve==0.1.7
+
+numpy>=1.22.2 # not directly required, pinned by Snyk to avoid a vulnerability
+pillow>=10.2.0 # not directly required, pinned by Snyk to avoid a vulnerability
+fonttools>=4.43.0 # not directly required, pinned by Snyk to avoid a vulnerability
+
diff --git a/requirements.txt b/requirements.txt
@@ -1,56 +1,61 @@
-numpy==1.26.4
-pandas==2.2.1
+numpy==1.26.3
+pandas==2.1.4
 pandas-ta==0.3.14b
 
-ccxt==4.2.87
-cryptography==42.0.5
-aiohttp==3.9.3
-SQLAlchemy==2.0.29
-python-telegram-bot==21.0.1
+ccxt==3.1.44
+cryptography==42.0.2; platform_machine != 'armv7l'
+cryptography==42.0.2; platform_machine == 'armv7l'
+aiohttp==3.9.0
+SQLAlchemy==2.0.16
+python-telegram-bot==20.3
+
 # can't be hard-pinned due to telegram-bot pinning httpx with ~
 httpx>=0.24.1
 arrow==1.3.0
-cachetools==5.3.3
+cachetools==5.3.2
 requests==2.31.0
-urllib3==2.2.1
-jsonschema==4.21.1
+
+urllib3==2.0.7
+
+jsonschema==4.19.1
+
 TA-Lib==0.4.28
-technical==1.4.3
+technical==1.4.2
 tabulate==0.9.0
 pycoingecko==3.1.0
 jinja2==3.1.3
 tables==3.9.1
 joblib==1.3.2
-rich==13.7.1
-pyarrow==15.0.2; platform_machine != 'armv7l'
+rich==13.7.0
+pyarrow==14.0.2; platform_machine != 'armv7l'
 
 # find first, C search in arrays
 py_find_1st==1.1.6
 
 # Load ticker files 30% faster
-python-rapidjson==1.16
+python-rapidjson==1.14
 # Properly format api responses
-orjson==3.10.0
+orjson==3.9.10
 
 # Notify systemd
 sdnotify==0.3.2
 
 # API Server
-fastapi==0.110.0
-pydantic==2.6.4
-uvicorn==0.29.0
+fastapi==0.103.2
+pydantic==2.4.0
+uvicorn==0.23.2
+
 pyjwt==2.8.0
 aiofiles==23.2.1
-psutil==5.9.8
+psutil==5.9.7
 
 # Support for colorized terminal output
 colorama==0.4.6
 # Building config files interactively
 questionary==2.0.1
 prompt-toolkit==3.0.36
 # Extensions to datetime library
-python-dateutil==2.9.0.post0
-pytz==2024.1
+python-dateutil==2.8.2
 
 #Futures
 schedule==1.2.1
@@ -59,5 +64,5 @@ schedule==1.2.1
 websockets==12.0
 janus==1.0.0
 
-ast-comments==1.2.2
-packaging==24.0
+ast-comments==1.2.1
+packaging==23.2