From 74e8e62126c85c3b9326e46f4c5b90ab18627360 Mon Sep 17 00:00:00 2001 From: Sami Jaghouar Date: Tue, 13 Dec 2022 17:01:16 +0100 Subject: [PATCH 1/7] chore: add different python version to i Signed-off-by: Sami Jaghouar --- .github/workflows/ci.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6996e768b45..9bdb5533ae7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,10 +52,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.8 - name: Lint with flake8 run: | pip install flake8 @@ -70,10 +70,10 @@ jobs: - uses: actions/checkout@v2.5.0 with: fetch-depth: 0 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: 3.8 - id: file_changes uses: Ana06/get-changed-files@v1.2 - name: check black @@ -89,11 +89,11 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} ref: ${{ github.event.pull_request.head.sha }} - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v4 if: ${{ !github.event.pull_request.head.repo.fork }} with: - python-version: 3.7 + python-version: 3.8 - name: Styling id: styling if: ${{ !github.event.pull_request.head.repo.fork }} @@ -124,12 +124,15 @@ jobs: import-test: runs-on: ubuntu-latest + strategy: + matrix: + python-env: ["3.8", "3.9", "3.10", "3.11"] steps: - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v4 with: - python-version: 3.7 + python-version: ${{ matrix.python-env }} - name: Prepare enviroment run: | python -m pip install --upgrade pip @@ -160,7 +163,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7] + python-version: [3.8] test-path: ${{fromJson(needs.prep-testbed.outputs.matrix)}} steps: - uses: actions/checkout@v2.5.0 @@ -197,7 +200,7 @@ jobs: files: "coverage.xml" - name: Upload coverage from test to Codecov uses: codecov/codecov-action@v3.1.1 - if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' + if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.8' with: file: coverage.xml flags: ${{ steps.test.outputs.codecov_flag }} @@ -210,7 +213,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7] + python-version: [3.8] test-path: ${{fromJson(needs.prep-testbed.outputs.matrix-oldproto)}} steps: - uses: actions/checkout@v2 @@ -248,7 +251,7 @@ jobs: files: "coverage.xml" - name: Upload coverage from test to Codecov uses: codecov/codecov-action@v2 - if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' + if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.8' with: file: coverage.xml flags: ${{ steps.test.outputs.codecov_flag }} From 89302ecdadb1a141a7387019a6098e7ca26f704d Mon Sep 17 00:00:00 2001 From: Sami Jaghouar Date: Tue, 13 Dec 2022 17:03:24 +0100 Subject: [PATCH 2/7] chore: update cd as well Signed-off-by: Sami Jaghouar --- .github/workflows/cd.yml | 8 ++++---- .github/workflows/ci.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ccd020109e1..12258c102dc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -32,7 +32,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7] + python-version: [3.8] test-path: ${{fromJson(needs.prep-testbed.outputs.matrix)}} steps: - uses: actions/checkout@v2.5.0 @@ -69,7 +69,7 @@ jobs: files: "coverage.xml" - name: Upload coverage from test to Codecov uses: codecov/codecov-action@v3.1.1 - if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' + if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.8' with: file: coverage.xml flags: ${{ steps.test.outputs.codecov_flag }} @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7] + python-version: [3.8] test-path: ${{fromJson(needs.prep-testbed.outputs.matrix-oldproto)}} steps: - uses: actions/checkout@v2 @@ -120,7 +120,7 @@ jobs: files: "coverage.xml" - name: Upload coverage from test to Codecov uses: codecov/codecov-action@v2 - if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.7' + if: steps.check_files.outputs.files_exists == 'true' && ${{ matrix.python-version }} == '3.8' with: file: coverage.xml flags: ${{ steps.test.outputs.codecov_flag }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bdb5533ae7..402ce518267 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-env: ["3.8", "3.9", "3.10", "3.11"] + python-env: [3.8, 3.9, 3.10, 3.11] steps: - uses: actions/checkout@v2.5.0 - name: Set up Python 3.8 From 3a91bf5ef069781b5064523929602007dfeb27b2 Mon Sep 17 00:00:00 2001 From: Sami Jaghouar Date: Wed, 14 Dec 2022 09:09:42 +0100 Subject: [PATCH 3/7] fix: remove 3.11 for now Signed-off-by: Sami Jaghouar --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 402ce518267..26d69093e1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-env: [3.8, 3.9, 3.10, 3.11] + python-env: [3.8, 3.9] steps: - uses: actions/checkout@v2.5.0 - name: Set up Python 3.8 From 62b9a301b41fa32b04a74da4b64a77cc8075665d Mon Sep 17 00:00:00 2001 From: Sami Jaghouar Date: Wed, 14 Dec 2022 09:12:26 +0100 Subject: [PATCH 4/7] fix: add back 3.10 Signed-off-by: Sami Jaghouar --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26d69093e1d..0143a4c4804 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-env: [3.8, 3.9] + python-env: [3.8, 3.9, '3.10'] steps: - uses: actions/checkout@v2.5.0 - name: Set up Python 3.8 From 822fde8714c2f22ed72bb77b080b946d4779698a Mon Sep 17 00:00:00 2001 From: Sami Jaghouar Date: Wed, 14 Dec 2022 09:13:28 +0100 Subject: [PATCH 5/7] fix: add back 3.11 Signed-off-by: Sami Jaghouar --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0143a4c4804..081b6a6b3fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-env: [3.8, 3.9, '3.10'] + python-env: [3.8, 3.9, '3.10', '3.11'] steps: - uses: actions/checkout@v2.5.0 - name: Set up Python 3.8 From 3bc9bd7b41c5f7a864a305b4185c9e374457b007 Mon Sep 17 00:00:00 2001 From: samsja <55492238+samsja@users.noreply.github.com> Date: Wed, 14 Dec 2022 09:45:31 +0100 Subject: [PATCH 6/7] feat: apply aleaddine suggestion Co-authored-by: AlaeddineAbdessalem Signed-off-by: samsja <55492238+samsja@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 081b6a6b3fc..24dd2f32866 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,7 +129,7 @@ jobs: python-env: [3.8, 3.9, '3.10', '3.11'] steps: - uses: actions/checkout@v2.5.0 - - name: Set up Python 3.8 + - name: Set up Python uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-env }} From a89a2ad5ad28c9e72e4af9bb5b3da505533047c1 Mon Sep 17 00:00:00 2001 From: Sami Jaghouar Date: Wed, 14 Dec 2022 09:45:47 +0100 Subject: [PATCH 7/7] fix: string stuff Signed-off-by: Sami Jaghouar --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 081b6a6b3fc..7c623678286 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-env: [3.8, 3.9, '3.10', '3.11'] + python-env: ['3.8', '3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v2.5.0 - name: Set up Python 3.8