From bb5aa28f0e84d72cb6347a98d3f843e2f4ef905c Mon Sep 17 00:00:00 2001
From: MichaelFu512 <MichaelFu512@gmail.com>
Date: Fri, 31 May 2024 12:35:28 -0700
Subject: [PATCH] windows no parallel-cpu and reorder linux test

---
 .github/workflows/lint_tests.yaml                   |  2 +-
 .../linux_unit_tests_with_latest_deps.yaml          | 13 ++-----------
 .../linux_unit_tests_with_minimum_deps.yaml         |  2 +-
 .github/workflows/windows_unit_tests.yaml           |  2 +-
 Makefile                                            |  8 ++++++++
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/lint_tests.yaml b/.github/workflows/lint_tests.yaml
index ec3dc42245..b26523ff7c 100644
--- a/.github/workflows/lint_tests.yaml
+++ b/.github/workflows/lint_tests.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python_version: ["3.9", "3.10"]
+        python_version: ["3.9", "3.10", "3.11"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
diff --git a/.github/workflows/linux_unit_tests_with_latest_deps.yaml b/.github/workflows/linux_unit_tests_with_latest_deps.yaml
index ced7f343c0..24e3ff5548 100644
--- a/.github/workflows/linux_unit_tests_with_latest_deps.yaml
+++ b/.github/workflows/linux_unit_tests_with_latest_deps.yaml
@@ -14,17 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - python_version: "3.9"
-            command: 'git-test-automl'
-          - python_version: "3.9"
-            command: 'git-test-prophet'
-          - python_version: "3.9"
-            command: 'git-test-modelunderstanding'
-          - python_version: "3.9"
-            command: 'git-test-other'
-          - python_version: "3.9"
-            command: 'git-test-parallel'
+        python_version: ['3.9']
+        command: ['git-test-automl', 'git-test-modelunderstanding', 'git-test-parallel', 'git-test-prophet', 'git-test-other']
     steps:
       - name: Set up Python ${{ matrix.python_version }}
         uses: actions/setup-python@v4
diff --git a/.github/workflows/linux_unit_tests_with_minimum_deps.yaml b/.github/workflows/linux_unit_tests_with_minimum_deps.yaml
index ade8d2cb6a..8fa37594cf 100644
--- a/.github/workflows/linux_unit_tests_with_minimum_deps.yaml
+++ b/.github/workflows/linux_unit_tests_with_minimum_deps.yaml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         python_version: ['3.9']
-        command: ['git-test-automl', 'git-test-modelunderstanding', 'git-test-other', 'git-test-parallel', 'git-test-prophet']
+        command: ['git-test-automl', 'git-test-modelunderstanding', 'git-test-parallel', 'git-test-prophet', 'git-test-other']
     steps:
       - name: Set up Python ${{ matrix.python_version }}
         uses: actions/setup-python@v4
diff --git a/.github/workflows/windows_unit_tests.yaml b/.github/workflows/windows_unit_tests.yaml
index c6cd519c24..28f586a54a 100644
--- a/.github/workflows/windows_unit_tests.yaml
+++ b/.github/workflows/windows_unit_tests.yaml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         python_version: ['3.9']
-        command: ['git-test-automl', 'git-test-modelunderstanding', 'git-test-other', 'git-test-parallel', 'git-test-prophet']
+        command: ['git-test-automl', 'git-test-modelunderstanding', 'git-test-parallel', 'git-test-prophet-no-parallel-cpu', 'git-test-other-no-parallel-cpu']
     steps:
       - name: Download Miniconda
         shell: pwsh
diff --git a/Makefile b/Makefile
index df2da9c889..f359b8fed0 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,14 @@ git-test-prophet:
 git-test-integration:
 	pytest evalml/tests/integration_tests -n 2 --durations 0 --timeout $(TIMEOUT) --cov=evalml --cov-config=./pyproject.toml --junitxml=test-reports/git-test-integration-junit.xml
 
+.PHONY: git-test-other-no-parallel-cpu
+git-test-other:
+	pytest evalml/tests --ignore evalml/tests/automl_tests/ --ignore evalml/tests/tuner_tests/ --ignore evalml/tests/model_understanding_tests/ --ignore evalml/tests/pipeline_tests/test_pipelines.py --ignore evalml/tests/component_tests/test_prophet_regressor.py --ignore evalml/tests/component_tests/test_components.py --ignore evalml/tests/component_tests/test_utils.py --ignore evalml/tests/integration_tests/ --durations 0 --timeout $(TIMEOUT) --cov=evalml --cov-config=./pyproject.toml --junitxml=test-reports/git-test-other-junit.xml
+	make doctests
+
+.PHONY: git-test-prophet-no-parallel-cpu
+git-test-prophet:
+	pytest evalml/tests/component_tests/test_prophet_regressor.py evalml/tests/component_tests/test_components.py evalml/tests/component_tests/test_utils.py evalml/tests/pipeline_tests/test_pipelines.py --durations 0 --timeout $(TIMEOUT) --cov=evalml --cov-config=./pyproject.toml --junitxml=test-reports/git-test-prophet-junit.xml
 
 .PHONY: installdeps
 installdeps: