diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index 614f7a1..1bf16d4 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -1,12 +1,10 @@ -name: Run Tests and Build Package +name: Run Tests on: push: - branches: [ main, develop ] + branches: [main, develop] pull_request: - branches: [ main, develop ] - schedule: - - cron: '0 10 5 * *' # Optional scheduled runs + branches: [main, develop] jobs: test: @@ -31,10 +29,5 @@ jobs: - name: Run Tests with Coverage run: | - poetry run pytest ./tests --cov=./cpm_python --cov-report=xml --cov-report=term - - - name: Upload Coverage Report to Codecov - uses: codecov/codecov-action@v3 - with: - files: ./coverage.xml - fail_ci_if_error: true # Fails the CI if uploading fails \ No newline at end of file + export PYTHONPATH=$(pwd) + poetry run pytest ./tests --cov=./cpm --cov-report=xml --cov-report=term diff --git a/.gitignore b/.gitignore index 248259c..c7dc1f5 100644 --- a/.gitignore +++ b/.gitignore @@ -162,5 +162,6 @@ cython_debug/ examples/tmp examples/simulated_data +tests/tmp poetry.lock \ No newline at end of file diff --git a/README.md b/README.md index 36afe8c..4df7bf6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/wwu-mmll/cpm_python/cpm/python-test)](https://github.com/wwu-mmll/cpm_python/actions) +[![GitHub Workflow Status](https://github.com/wwu-mmll/confound_corrected_cpm/actions/workflows/python-test.yml/badge.svg)](https://github.com/wwu-mmll/confound_corrected_cpm/actions/workflows/python-test.yml) [![Coverage Status](https://coveralls.io/repos/github/wwu-mmll/cpm_python/badge.svg?branch=main)](https://coveralls.io/github/wwu-mmll/cpm_python?branch=main) [![Github Contributors](https://img.shields.io/github/contributors-anon/wwu-mmll/cpm_python?color=blue)](https://github.com/wwu-mmll/cpm_python/graphs/contributors) [![Github Commits](https://img.shields.io/github/commit-activity/y/wwu-mmll/cpm_python)](https://github.com/wwu-mmll/cpm_python/commits/main) diff --git a/tests/test_cpm_regression.py b/tests/test_cpm_regression.py index 1afad26..b6e9a95 100644 --- a/tests/test_cpm_regression.py +++ b/tests/test_cpm_regression.py @@ -22,7 +22,6 @@ def setUp(self): cpm = CPMRegression(results_directory='./tmp', cv=KFold(n_splits=10, shuffle=True, random_state=42), edge_selection=univariate_edge_selection, - add_edge_filter=True, n_permutations=2) self.X, self.y, self.covariates = simulate_regression_data_2(n_samples=100, n_features=45) diff --git a/tests/test_package.py b/tests/test_package.py deleted file mode 100644 index 1ae726c..0000000 --- a/tests/test_package.py +++ /dev/null @@ -1,10 +0,0 @@ -import unittest - - -class TestHelloWorld(unittest.TestCase): - def test_hello_world(self): - self.assertEqual("Hello, world!", "Hello, world!") - - -if __name__ == '__main__': - unittest.main()