From df2dddf818e7e52785da690b98c539540fa0372f Mon Sep 17 00:00:00 2001 From: Ilya Matiach Date: Mon, 6 Jan 2025 16:59:25 -0500 Subject: [PATCH] Fix builds and update to python 3.9 as default in tests --- .github/workflows/CI-e2e-notebooks.yml | 7 ++++--- .github/workflows/CI-notebook.yml | 7 ++++--- .github/workflows/CI-python.yml | 23 ++++++++-------------- .github/workflows/CI-raiwidgets-pytest.yml | 21 ++++++++------------ 4 files changed, 24 insertions(+), 34 deletions(-) diff --git a/.github/workflows/CI-e2e-notebooks.yml b/.github/workflows/CI-e2e-notebooks.yml index bab6303ec9..bdfd5cc98c 100644 --- a/.github/workflows/CI-e2e-notebooks.yml +++ b/.github/workflows/CI-e2e-notebooks.yml @@ -47,7 +47,7 @@ jobs: matrix: # TODO: add macos operatingSystem: [ubuntu-latest, windows-latest] - pythonVersion: [3.8, 3.9, "3.10"] + pythonVersion: [3.9, "3.10"] flights: ["", "dataBalanceExperience"] notebookGroup: ["nb_group_1", "nb_group_2", "nb_group_3"] exclude: @@ -109,7 +109,8 @@ jobs: cat installed-requirements-dev.txt working-directory: raiwidgets - - name: Upload requirements + - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') && (matrix.flights == '') && (matrix.notebookGroup == 'nb_group_1') }} + name: Upload requirements uses: actions/upload-artifact@v4 with: name: requirements-dev.txt @@ -142,5 +143,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: raiwidgets-e2e-screen-shot + name: raiwidgets-ci-e2e-notebooks-screen-shot-${{ matrix.notebookGroup }}-${{ matrix.flights }}-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }} path: ./dist/cypress diff --git a/.github/workflows/CI-notebook.yml b/.github/workflows/CI-notebook.yml index a23e63affb..42fb890388 100644 --- a/.github/workflows/CI-notebook.yml +++ b/.github/workflows/CI-notebook.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: operatingSystem: [ubuntu-latest, windows-latest] - pythonVersion: [3.7, 3.8, 3.9, "3.10"] + pythonVersion: [3.9, "3.10"] runs-on: ${{ matrix.operatingSystem }} @@ -74,7 +74,8 @@ jobs: cat installed-requirements-dev.txt working-directory: raiwidgets - - name: Upload requirements + - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }} + name: Upload requirements uses: actions/upload-artifact@v4 with: name: requirements-dev.txt @@ -95,5 +96,5 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: raiwidgets-e2e-screen-shot + name: raiwidgets-ci-notebook-screen-shot-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }} path: dist/cypress diff --git a/.github/workflows/CI-python.yml b/.github/workflows/CI-python.yml index 290990da09..4daf5f8280 100644 --- a/.github/workflows/CI-python.yml +++ b/.github/workflows/CI-python.yml @@ -19,16 +19,8 @@ jobs: packageDirectory: ["responsibleai", "erroranalysis", "raiutils", "rai_test_utils"] operatingSystem: [ubuntu-latest, macos-latest, windows-latest] - pythonVersion: ["3.7", "3.8", "3.9", "3.10", "3.11"] + pythonVersion: ["3.9", "3.10", "3.11"] exclude: - - operatingSystem: macos-latest - pythonVersion: "3.7" - - operatingSystem: ubuntu-latest - pythonVersion: "3.7" - - operatingSystem: windows-latest - pythonVersion: "3.7" - - operatingSystem: macos-latest - pythonVersion: "3.8" - packageDirectory: "responsibleai" pythonVersion: "3.11" @@ -69,7 +61,8 @@ jobs: cat installed-requirements-dev.txt working-directory: raiwidgets - - name: Upload requirements + - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') && (matrix.packageDirectory == 'responsibleai') }} + name: Upload requirements uses: actions/upload-artifact@v4 with: name: requirements-dev.txt @@ -83,12 +76,12 @@ jobs: - name: Upload code coverage results uses: actions/upload-artifact@v4 with: - name: ${{ matrix.packageDirectory }}-code-coverage-results - path: ${{ matrix.packageDirectory }}/htmlcov + name: ${{ matrix.packageDirectory }}-${{ matrix.pythonVersion}}-code-coverage-results + path: ${{ matrix.packageDirectory }}-${{ matrix.pythonVersion}}/htmlcov # Use always() to always run this step to publish test results when there are test failures if: ${{ always() }} - - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.8') }} + - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }} name: Upload to codecov id: codecovupload1 uses: codecov/codecov-action@v3 @@ -102,7 +95,7 @@ jobs: name: codecov-umbrella verbose: true - - if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }} + - if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }} name: Retry upload to codecov id: codecovupload2 uses: codecov/codecov-action@v3 @@ -117,7 +110,7 @@ jobs: verbose: true - name: Set codecov status - if: ${{ (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }} + if: ${{ (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }} shell: bash run: | if ${{ (steps.codecovupload1.outcome == 'success') || (steps.codecovupload2.outcome == 'success') }} ; then diff --git a/.github/workflows/CI-raiwidgets-pytest.yml b/.github/workflows/CI-raiwidgets-pytest.yml index a0b84162cc..9cb55a2c3f 100644 --- a/.github/workflows/CI-raiwidgets-pytest.yml +++ b/.github/workflows/CI-raiwidgets-pytest.yml @@ -17,17 +17,11 @@ jobs: matrix: packageDirectory: ["raiwidgets"] operatingSystem: [ubuntu-latest, macos-latest, windows-latest] - pythonVersion: [3.7, 3.8, 3.9, "3.10"] + pythonVersion: [3.9, "3.10"] exclude: - packageDirectory: "raiwidgets" operatingSystem: macos-latest pythonVersion: 3.9 - - packageDirectory: "raiwidgets" - operatingSystem: windows-latest - pythonVersion: 3.8 - - packageDirectory: "raiwidgets" - operatingSystem: macos-latest - pythonVersion: 3.7 runs-on: ${{ matrix.operatingSystem }} @@ -102,7 +96,8 @@ jobs: cat installed-requirements-dev.txt working-directory: ${{ matrix.packageDirectory }} - - name: Upload requirements + - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }} + name: Upload requirements uses: actions/upload-artifact@v4 with: name: requirements-dev.txt @@ -119,10 +114,10 @@ jobs: name: Upload code coverage results uses: actions/upload-artifact@v4 with: - name: ${{ matrix.packageDirectory }}-code-coverage-results - path: ${{ matrix.packageDirectory }}/htmlcov + name: ${{ matrix.packageDirectory }}-${{ matrix.pythonVersion}}-code-coverage-results + path: ${{ matrix.packageDirectory }}-${{ matrix.pythonVersion}}/htmlcov - - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.8') }} + - if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }} name: Upload to codecov id: codecovupload1 uses: codecov/codecov-action@v3 @@ -136,7 +131,7 @@ jobs: name: codecov-umbrella verbose: true - - if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }} + - if: ${{ (steps.codecovupload1.outcome == 'failure') && (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }} name: Retry upload to codecov id: codecovupload2 uses: codecov/codecov-action@v3 @@ -151,7 +146,7 @@ jobs: verbose: true - name: Set codecov status - if: ${{ (matrix.pythonVersion == '3.8') && (matrix.operatingSystem == 'windows-latest') }} + if: ${{ (matrix.pythonVersion == '3.9') && (matrix.operatingSystem == 'windows-latest') }} shell: bash run: | if ${{ (steps.codecovupload1.outcome == 'success') || (steps.codecovupload2.outcome == 'success') }} ; then