chore: consistent naming for python packages in docker image

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/quickadapter/Dockerfile.quickadapter b/quickadapter/Dockerfile.quickadapter
index 40daff3b5a88617f91a07046e0d9ebaacdc9023a..1e85327839a9c00ecd801c7890dbf78313e7c559 100644 (file)
--- a/quickadapter/Dockerfile.quickadapter
+++ b/quickadapter/Dockerfile.quickadapter
@@ -2,7 +2,7 @@ FROM freqtradeorg/freqtrade:stable_freqai
 
 ARG optuna_version=4.6.0
 ARG scikit_learn_extra_version=0.3.0
-ARG skimage_version=0.25.2
+ARG scikit_image_version=0.25.2
 
 USER root
 RUN apt-get update \
@@ -14,7 +14,7 @@ RUN pip install --user --no-cache-dir \
     optuna-integration==${optuna_version} \
     optuna-dashboard \
     scikit-learn-extra==${scikit_learn_extra_version} \
-    scikit-image==${skimage_version}
+    scikit-image==${scikit_image_version}
 
 LABEL org.opencontainers.image.source="freqai-strategies" \
       org.opencontainers.image.title="freqtrade-quickadapter" \

diff --git a/quickadapter/docker-compose.yml b/quickadapter/docker-compose.yml
index f3efde95b03a21b57214b3812645c6b27ec4c469..7177a0c52ed6f6b848a649825327f7466e0fe7fe 100644 (file)
--- a/quickadapter/docker-compose.yml
+++ b/quickadapter/docker-compose.yml
@@ -19,7 +19,7 @@ services:
       args:
         optuna_version: 4.5.0
         scikit_learn_extra_version: 0.3.0
-        skimage_version: 0.25.2
+        scikit_image_version: 0.25.2
     restart: unless-stopped
     container_name: freqtrade-quickadapter
     environment:

diff --git a/renovate.json b/renovate.json
index 0e0b4f1bdf2b4ac89ccfb2b37ee40e30cef8c3c9..a34056e6181b9470499cba96d5c363b7444c6065 100644 (file)
--- a/renovate.json
+++ b/renovate.json
@@ -8,34 +8,6 @@
     "enabled": true
   },
   "customManagers": [
-    {
-      "customType": "regex",
-      "managerFilePatterns": [
-        "**/Dockerfile*",
-        "**/docker-compose*.yml"
-      ],
-      "matchStrings": [
-        "ARG\\s+scikit_learn_extra_version=(?<currentValue>[^\\s]+)",
-        "\\s+scikit_learn_extra_version:\\s*(?<currentValue>[^\\s]+)"
-      ],
-      "datasourceTemplate": "pypi",
-      "depNameTemplate": "scikit_learn_extra",
-      "packageNameTemplate": "scikit-learn-extra"
-    },
-    {
-      "customType": "regex",
-      "managerFilePatterns": [
-        "**/Dockerfile*",
-        "**/docker-compose*.yml"
-      ],
-      "matchStrings": [
-        "ARG\\s+skimage_version=(?<currentValue>[^\\s]+)",
-        "\\s+skimage_version:\\s*(?<currentValue>[^\\s]+)"
-      ],
-      "datasourceTemplate": "pypi",
-      "depNameTemplate": "skimage",
-      "packageNameTemplate": "scikit-image"
-    },
     {
       "customType": "regex",
       "managerFilePatterns": [
@@ -48,7 +20,7 @@
       ],
       "datasourceTemplate": "pypi",
       "depNameTemplate": "{{depName}}",
-      "packageNameTemplate": "{{depName}}"
+      "packageNameTemplate": "{{{replace '_' '-' depName}}}"
     }
   ]
 }