Merge branch 'main' into 2335_docs

alteryx · Jun 15, 2021 · 7e23e06 · 7e23e06
2 parents 1f7f074 + ca576c1
commit 7e23e06
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/linux_unit_tests_with_dask.yml b/.github/workflows/linux_unit_tests_with_dask.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   unit_tests:
-    name: ${{ matrix.python_version }} unit tests, Core Dependencies (${{ matrix.core_dependencies }}), Codecov (${{ matrix.codecov }})
+    name: ${{ matrix.python_version }} Unit Tests, Core Dependencies (${{ matrix.core_dependencies }}), Codecov (${{ matrix.codecov }}), Dask Only
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

diff --git a/.github/workflows/linux_unit_tests_with_latest_deps.yml b/.github/workflows/linux_unit_tests_with_latest_deps.yml
@@ -70,12 +70,12 @@ jobs:
         name: Run unit tests with minimal dependencies
         run: |
           source test_python/bin/activate
-          make git-test-minimal-deps
+          make git-test-minimal-deps-no-dask
       - if: ${{ !matrix.core_dependencies }}
         name: Run unit tests
         run: |
           source test_python/bin/activate
-          make git-test
+          make git-test-no-dask
       - if: ${{ matrix.codecov }}
         name: install coverage
         run: pip install coverage

diff --git a/.github/workflows/windows_unit_tests.yml b/.github/workflows/windows_unit_tests.yml
@@ -71,4 +71,4 @@ jobs:
         run: |
           . $env:USERPROFILE\Miniconda3\shell\condabin\conda-hook.ps1
           conda activate curr_py
-          make git-test
+          make git-test-no-dask
diff --git a/.github/workflows/windows_unit_tests_with_dask.yml b/.github/workflows/windows_unit_tests_with_dask.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   win_unit_tests:
-    name: ${{ matrix.python_version }} windows unit tests
+    name: ${{ matrix.python_version }} Windows Unit Tests, Dask Only
     runs-on: windows-latest
     strategy:
       fail-fast: true

diff --git a/Makefile b/Makefile
@@ -19,14 +19,22 @@ lint-fix:
 
 .PHONY: test
 test:
-	pytest evalml/ --doctest-modules --doctest-continue-on-failure --ignore=evalml/tests/automl_tests/dask_tests
+	pytest evalml/ --doctest-modules --doctest-continue-on-failure  --timeout 300
+
+.PHONY: test-no-dask
+test-no-dask:
+	pytest evalml/ --doctest-modules --doctest-continue-on-failure --ignore=evalml/tests/automl_tests/dask_tests  --timeout 300
 
 .PHONY: test-dask
 test:
 	pytest evalml/tests/automl_tests/dask_tests/ --doctest-modules --doctest-continue-on-failure  --timeout 300
 
 .PHONY: git-test
 git-test:
+	pytest evalml/ -n 2 --doctest-modules --cov=evalml --junitxml=test-reports/junit.xml --doctest-continue-on-failure  --timeout 300
+
+.PHONY: git-test-no-dask
+git-test-no-dask:
 	pytest evalml/ -n 2 --doctest-modules --cov=evalml --junitxml=test-reports/junit.xml --doctest-continue-on-failure  --ignore=evalml/tests/automl_tests/dask_tests --timeout 300
 
 .PHONY: git-test-dask
@@ -39,6 +47,10 @@ git-test-nocov:
 
 .PHONY: git-test-minimal-deps
 git-test-minimal-deps:
+	pytest evalml/ -n 2 --doctest-modules --cov=evalml --junitxml=test-reports/junit.xml --doctest-continue-on-failure --has-minimal-dependencies --timeout 300
+
+.PHONY: git-test-minimal-deps-no-dask
+git-test-minimal-deps-no-dask:
 	pytest evalml/ -n 2 --doctest-modules --cov=evalml --junitxml=test-reports/junit.xml --doctest-continue-on-failure --has-minimal-dependencies  --ignore=evalml/tests/automl_tests/dask_tests --timeout 300
 
 .PHONY: git-test-minimal-deps-dask

diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst
@@ -12,6 +12,7 @@ Release Notes
         * Add ``pytest-timeout``. All tests that run longer than 6 minutes will fail. :pr:`2374`
         * Separated the dask tests out into separate github action jobs to isolate dask failures. :pr:`2376`
         * Refactored dask tests :pr:`2377`
+        * Added the combined dask/non-dask unit tests back and renamed the dask only unit tests. :pr:`2382`
 
 .. warning::