From 3c444e2a9df4670ec89f956e425af4812f97ee55 Mon Sep 17 00:00:00 2001 From: sankalp Date: Tue, 29 Aug 2023 09:03:09 -0400 Subject: [PATCH] finalizing things --- .github/workflows/nightly.yml | 2 +- .github/workflows/test_matrix.json | 132 ++++++++++++++++++ .github/workflows/tests.yml | 48 +++---- .../functional_tests/choose_executor_test.py | 1 - tests/functional_tests/docs_how_to_test.py | 1 - .../qa_http_file_transfer_test.py | 1 - 6 files changed, 157 insertions(+), 28 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a6fcadf18..8497d4f60 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ name: nightly on: schedule: - - cron: "0 * * * *" + - cron: "0 4 * * *" jobs: license: diff --git a/.github/workflows/test_matrix.json b/.github/workflows/test_matrix.json index 6f1875723..a4a19eb07 100644 --- a/.github/workflows/test_matrix.json +++ b/.github/workflows/test_matrix.json @@ -237,5 +237,137 @@ "schedule", "workflow_dispatch" ] + }, + { + "name": "MacOS 11 / Python 3.8 / Dask", + "os": "macos-latest", + "python-version": "3.8", + "backend": "dask", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 11 / Python 3.8 / Local", + "os": "macos-latest", + "python-version": "3.8", + "backend": "local", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 11 / Python 3.9 / Dask", + "os": "macos-latest", + "python-version": "3.9", + "backend": "dask", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 11 / Python 3.9 / Local", + "os": "macos-latest", + "python-version": "3.9", + "backend": "local", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 11 / Python 3.10 / Dask", + "os": "macos-latest", + "python-version": "3.10", + "backend": "dask", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 11 / Python 3.10 / Local", + "os": "macos-latest", + "python-version": "3.10", + "backend": "local", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 12 / Python 3.8 / Dask", + "os": "macos-12", + "python-version": "3.8", + "backend": "dask", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 12 / Python 3.8 / Local", + "os": "macos-12", + "python-version": "3.8", + "backend": "local", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 12 / Python 3.9 / Dask", + "os": "macos-12", + "python-version": "3.9", + "backend": "dask", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 12 / Python 3.9 / Local", + "os": "macos-12", + "python-version": "3.9", + "backend": "local", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 12 / Python 3.10 / Dask", + "os": "macos-12", + "python-version": "3.10", + "backend": "dask", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] + }, + { + "name": "MacOS 12 / Python 3.10 / Local", + "os": "macos-12", + "python-version": "3.10", + "backend": "local", + "experimental": false, + "trigger": [ + "schedule", + "workflow_dispatch" + ] } ] diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d205f79f3..b26c502f4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -225,34 +225,34 @@ jobs: env: COVALENT_EXECUTOR_DIR: doc/source/how_to/execution/custom_executors - # - name: Run SDK tests and measure coverage - # id: sdk-tests - # if: > - # steps.modified-files.outputs.sdk == 'true' - # || env.BUILD_AND_RUN_ALL - # run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/covalent_tests --cov=covalent --cov-config=.coveragerc - - # - name: Generate SDK coverage report - # id: sdk-coverage - # if: steps.sdk-tests.outcome == 'success' - # run: coverage xml -o sdk_coverage.xml - - # - name: Run dispatcher tests and measure coverage - # id: dispatcher-tests - # if: > - # steps.modified-files.outputs.dispatcher == 'true' - # || env.BUILD_AND_RUN_ALL - # run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/covalent_dispatcher_tests --cov=covalent_dispatcher --cov-config=.coveragerc - - # - name: Generate dispatcher coverage report - # id: dispatcher-coverage - # if: steps.dispatcher-tests.outcome == 'success' - # run: coverage xml -o dispatcher_coverage.xml + - name: Run SDK tests and measure coverage + id: sdk-tests + if: > + steps.modified-files.outputs.sdk == 'true' + || env.BUILD_AND_RUN_ALL + run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/covalent_tests --cov=covalent --cov-config=.coveragerc + + - name: Generate SDK coverage report + id: sdk-coverage + if: steps.sdk-tests.outcome == 'success' + run: coverage xml -o sdk_coverage.xml + + - name: Run dispatcher tests and measure coverage + id: dispatcher-tests + if: > + steps.modified-files.outputs.dispatcher == 'true' + || env.BUILD_AND_RUN_ALL + run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/covalent_dispatcher_tests --cov=covalent_dispatcher --cov-config=.coveragerc + + - name: Generate dispatcher coverage report + id: dispatcher-coverage + if: steps.dispatcher-tests.outcome == 'success' + run: coverage xml -o dispatcher_coverage.xml - name: Run functional tests and measure coverage id: functional-tests if: env.BUILD_AND_RUN_ALL - run: PYTHONPATH=$PWD/ pytest -vvs tests/functional_tests --cov=covalent --cov=covalent_dispatcher --cov-config=.coveragerc + run: PYTHONPATH=$PWD/ pytest -vvs --reruns=5 tests/functional_tests --cov=covalent --cov=covalent_dispatcher --cov-config=.coveragerc - name: Generate functional test coverage report id: functional-coverage diff --git a/tests/functional_tests/choose_executor_test.py b/tests/functional_tests/choose_executor_test.py index 716807e12..11a9993b9 100644 --- a/tests/functional_tests/choose_executor_test.py +++ b/tests/functional_tests/choose_executor_test.py @@ -43,7 +43,6 @@ def workflow(y): assert output.result == "input" -# @pytest.mark.debug def test_using_executor_classes(): """Test creating executor objects and using them in a simple electron.""" diff --git a/tests/functional_tests/docs_how_to_test.py b/tests/functional_tests/docs_how_to_test.py index f9841bb69..572156508 100644 --- a/tests/functional_tests/docs_how_to_test.py +++ b/tests/functional_tests/docs_how_to_test.py @@ -51,7 +51,6 @@ ] -@pytest.mark.skip(reason="Temporarily skipping, to test whether this is the issue") @pytest.mark.parametrize("file, expected_return_value", zip(files, expected_return_values)) def test_how_to_file(file, expected_return_value): if os.path.basename(file) not in ignore_files: diff --git a/tests/functional_tests/qa_http_file_transfer_test.py b/tests/functional_tests/qa_http_file_transfer_test.py index bd372c3eb..b3f4e00f7 100644 --- a/tests/functional_tests/qa_http_file_transfer_test.py +++ b/tests/functional_tests/qa_http_file_transfer_test.py @@ -20,7 +20,6 @@ """Test http file transfer.""" - import covalent as ct