Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Anatoly Myachev <anatoly.myachev@intel.com>
  • Loading branch information
anmyachev committed Jun 16, 2024
1 parent b31cfde commit cc74b39
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/actions/mamba-env/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: "Prepare the environment to run Modin"
inputs:
python-version:
description: "Python version to install"
default: "3.10"
default: "3.9"
environment-file:
description: "Conda environment yml"
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/python-only/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: "Prepare the environment to run simple tasks"
inputs:
python-version:
description: "Python version to install"
default: "3.10.x"
default: "3.9"

runs:
using: "composite"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-required.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
fetch-depth: 1
- uses: actions/setup-python@v5
with:
python-version: "3.10.x"
python-version: "3.9"
architecture: "x64"
cache: "pip"
cache-dependency-path: '**/requirements-doc.txt'
Expand Down
29 changes: 22 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,26 @@ jobs:
fi
lint-mypy:
needs: [python-filter]
name: lint (mypy)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/python-only
with:
python-version: ${{ needs.python-filter.outputs.python-version }}
- run: pip install -r requirements-dev.txt
- run: mypy --config-file mypy.ini

lint-flake8:
needs: [python-filter]
name: lint (flake8)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/python-only
with:
python-version: ${{ needs.python-filter.outputs.python-version }}
# NOTE: If you are changing the set of packages installed here, make sure that
# the dev requirements match them.
- run: pip install flake8 flake8-print flake8-no-implicit-concat
Expand All @@ -69,6 +75,7 @@ jobs:
- run: flake8 modin/ asv_bench/benchmarks scripts/doc_checker.py

test-api-and-no-engine:
needs: [python-filter]
name: Test API, headers and no-engine mode
runs-on: ubuntu-latest
defaults:
Expand All @@ -79,14 +86,15 @@ jobs:
- uses: ./.github/actions/mamba-env
with:
environment-file: requirements/requirements-no-engine.yml
python-version: ${{ needs.python-filter.outputs.python-version }}
- run: python -m pytest modin/tests/pandas/test_api.py
- run: python -m pytest modin/tests/test_executions_api.py
- run: python -m pytest modin/tests/test_headers.py
- run: python -m pytest modin/tests/core/test_dispatcher.py::test_add_option
- uses: ./.github/actions/upload-coverage

test-clean-install:
needs: [lint-flake8]
needs: [lint-flake8, python-filter]
strategy:
matrix:
os:
Expand All @@ -100,6 +108,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/python-only
with:
python-version: ${{ needs.python-filter.outputs.python-version }}
- run: python -m pip install -e ".[all]"
- name: Ensure Ray and Dask engines start up
run: |
Expand All @@ -114,7 +124,7 @@ jobs:
if: matrix.os == 'ubuntu'

test-internals:
needs: [lint-flake8]
needs: [lint-flake8, python-filter]
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -125,6 +135,7 @@ jobs:
- uses: ./.github/actions/mamba-env
with:
environment-file: environment-dev.yml
python-version: ${{ needs.python-filter.outputs.python-version }}
- name: Internals tests
run: python -m pytest modin/tests/core/test_dispatcher.py
- run: python -m pytest modin/tests/config
Expand Down Expand Up @@ -156,6 +167,7 @@ jobs:
- uses: ./.github/actions/mamba-env
with:
environment-file: environment-dev.yml
python-version: ${{ needs.python-filter.outputs.python-version }}
- name: Install HDF5
run: sudo apt update && sudo apt install -y libhdf5-dev
- name: xgboost tests
Expand Down Expand Up @@ -340,7 +352,7 @@ jobs:
os:
- ubuntu
- windows
python-version: ["${{ needs.python-filter.outputs.python-version }}"]
python-version: [ "${{ needs.python-filter.outputs.python-version }}" ]
engine: ${{ fromJSON( github.event_name == 'push' && '["python", "ray", "dask"]' || needs.execution-filter.outputs.engines ) }}
test_task:
- group_1
Expand Down Expand Up @@ -473,7 +485,7 @@ jobs:
os:
- ubuntu
- windows
python-version: ["${{ needs.python-filter.outputs.python-version }}"]
python-version: [ "${{ needs.python-filter.outputs.python-version }}" ]
execution:
- name: ray
shell-ex: "python -m pytest"
Expand Down Expand Up @@ -599,7 +611,7 @@ jobs:
- uses: ./.github/actions/upload-coverage

test-experimental:
needs: [lint-flake8]
needs: [lint-flake8, python-filter]
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -621,6 +633,7 @@ jobs:
- uses: ./.github/actions/mamba-env
with:
environment-file: environment-dev.yml
python-version: ${{ needs.python-filter.outputs.python-version }}
- name: Install HDF5
run: sudo apt update && sudo apt install -y libhdf5-dev
- run: python -m pytest -n 2 modin/tests/pandas/dataframe/test_map_metadata.py
Expand All @@ -637,7 +650,7 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
python-version: ["${{ needs.python-filter.outputs.python-version }}"]
python-version: [ "${{ needs.python-filter.outputs.python-version }}" ]
engine: ["ray", "dask"]
env:
MODIN_EXPERIMENTAL: "True"
Expand Down Expand Up @@ -667,7 +680,7 @@ jobs:
delete-merged: true

upload-coverage:
needs: [merge-coverage-artifacts]
needs: [merge-coverage-artifacts, python-filter]
if: always() # we need to run it regardless of some job being skipped, like in PR
runs-on: ubuntu-latest
defaults:
Expand All @@ -676,6 +689,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/python-only
with:
python-version: ${{ needs.python-filter.outputs.python-version }}
- name: Download coverage data
uses: actions/download-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzzydata-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
python-version: ["3.10"]
python-version: ["3.9"]
engine: ["ray", "dask"]
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2
build:
os: ubuntu-20.04
tools:
python: "3.10"
python: "3.9"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down

0 comments on commit cc74b39

Please sign in to comment.