From 86af3fe0e7766a3dd86701d8142aeb327bafd7d2 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 15 May 2022 19:22:12 +0200
Subject: [PATCH 1/2] Update image versions from 3.9 to 3.10

---
 .github/workflows/ci.yml | 6 +++---
 Dockerfile               | 2 +-
 docker/Dockerfile.armhf  | 2 +-
 setup.cfg                | 2 +-
 setup.sh                 | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96575f034..09946e6b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -273,7 +273,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: pre-commit dependencies
       run: |
@@ -292,7 +292,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: 3.9
+        python-version: 3.10
 
     - name: Documentation build
       run: |
@@ -358,7 +358,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Extract branch name
       shell: bash
diff --git a/Dockerfile b/Dockerfile
index 8f5b85698..5f7b52265 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9.9-slim-bullseye as base
+FROM python:3.10.4-slim-bullseye as base
 
 # Setup env
 ENV LANG C.UTF-8
diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf
index 16f2aebcd..73fc681eb 100644
--- a/docker/Dockerfile.armhf
+++ b/docker/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM python:3.9.9-slim-bullseye as base
+FROM python:3.9.12-slim-bullseye as base
 
 # Setup env
 ENV LANG C.UTF-8
diff --git a/setup.cfg b/setup.cfg
index edbd320c3..042517ec9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,7 +32,7 @@ tests_require =
     pytest-mock
 
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.8
 
 [options.entry_points]
 console_scripts =
diff --git a/setup.sh b/setup.sh
index dcf6c02c7..bb51c3a2f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,7 +25,7 @@ function check_installed_python() {
         exit 2
     fi
 
-    for v in 9 10 8
+    for v in 10 9 8
     do
         PYTHON="python3.${v}"
         which $PYTHON

From 008ee148890b3c396c311483340bfb698ebd925a Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Sun, 15 May 2022 19:25:27 +0200
Subject: [PATCH 2/2] Improve ci to run on ubuntu 22.04

---
 .github/workflows/ci.yml | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 09946e6b5..d11285ba4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-18.04, ubuntu-20.04 ]
+        os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04 ]
         python-version: ["3.8", "3.9", "3.10"]
 
     steps:
@@ -70,7 +70,7 @@ jobs:
       if: matrix.python-version == '3.9'
 
     - name: Coveralls
-      if: (runner.os == 'Linux' && matrix.python-version == '3.8')
+      if: (runner.os == 'Linux' && matrix.python-version == '3.9')
       env:
         # Coveralls token. Not used as secret due to github not providing secrets to forked repositories
         COVERALLS_REPO_TOKEN: 6D1m0xupS3FgutfuGao8keFf9Hc0FpIXu
@@ -157,24 +157,9 @@ jobs:
         pip install -e .
 
     - name: Tests
-      if: (runner.os != 'Linux' || matrix.python-version != '3.8')
       run: |
         pytest --random-order
 
-    - name: Tests (with cov)
-      if: (runner.os == 'Linux' && matrix.python-version == '3.8')
-      run: |
-        pytest --random-order --cov=freqtrade --cov-config=.coveragerc
-
-    - name: Coveralls
-      if: (runner.os == 'Linux' && matrix.python-version == '3.8')
-      env:
-        # Coveralls token. Not used as secret due to github not providing secrets to forked repositories
-        COVERALLS_REPO_TOKEN: 6D1m0xupS3FgutfuGao8keFf9Hc0FpIXu
-      run: |
-        # Allow failure for coveralls
-        coveralls -v  || true
-
     - name: Backtesting
       run: |
         cp config_examples/config_bittrex.example.json config.json
@@ -273,7 +258,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: 3.10
+        python-version: "3.10"
 
     - name: pre-commit dependencies
       run: |
@@ -292,7 +277,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: 3.10
+        python-version: "3.10"
 
     - name: Documentation build
       run: |
@@ -358,7 +343,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v3
       with:
-        python-version: 3.9
+        python-version: "3.9"
 
     - name: Extract branch name
       shell: bash