From dae6880da0e2f9fca82ce978b8808a5cef249101 Mon Sep 17 00:00:00 2001 From: Lorenz Schori Date: Tue, 7 May 2024 11:37:09 +0200 Subject: [PATCH 1/5] Replace travis with GH actions --- .github/workflows/python-package.yml | 55 ++++++++++++++++++++++++++++ .travis.yml | 15 -------- 2 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 .github/workflows/python-package.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml new file mode 100644 index 0000000..8b02c67 --- /dev/null +++ b/.github/workflows/python-package.yml @@ -0,0 +1,55 @@ +--- +name: Python package + +on: + push: + branches: [ "stable" ] + pull_request: + branches: [ "stable" ] + +jobs: + test: + + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.7", "3.9", "3.11"] + + steps: + - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v3 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip wheel + python -m pip install --requirement test-requirements.txt + python -m pip install --editable .[tests] + - name: Lint with pylint and pyflakes + run: | + pylint --errors-only spreadflow_core + pyflakes spreadflow_core + - name: Test with trial + run: | + COVERAGE_PROCESS_START=`pwd`/.coveragerc trial spreadflow_core + coverage combine `pwd` `pwd`/_trial_temp + coverage xml + - name: Coveralls Parallel + uses: coverallsapp/github-action@v2 + with: + flag-name: run-${{ join(matrix.*, '-') }} + format: cobertura + parallel: true + + finish: + needs: test + if: ${{ always() }} + runs-on: ubuntu-latest + steps: + - name: Coveralls Finished + uses: coverallsapp/github-action@v2 + with: + parallel-finished: true + carryforward: "run-3.7,run-3.9,run-3.11" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 0a155de..0000000 --- a/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: python -python: - - 2.7 - - 3.4 -cache: - directories: - - $HOME/.cache/pip -install: - - pip install -U pip wheel - - pip install -r test-requirements.txt - - pip install -e .[tests] -script: - - coverage run `which trial` spreadflow_delta -after_success: - - coveralls From 79613a301ff1290ab58cb916ac591bbc66329214 Mon Sep 17 00:00:00 2001 From: Lorenz Schori Date: Tue, 7 May 2024 11:39:45 +0200 Subject: [PATCH 2/5] No pylint in this project --- .github/workflows/python-package.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 8b02c67..beaaacc 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -27,10 +27,6 @@ jobs: python -m pip install --upgrade pip wheel python -m pip install --requirement test-requirements.txt python -m pip install --editable .[tests] - - name: Lint with pylint and pyflakes - run: | - pylint --errors-only spreadflow_core - pyflakes spreadflow_core - name: Test with trial run: | COVERAGE_PROCESS_START=`pwd`/.coveragerc trial spreadflow_core From bfedca50ba8a7bf08418b10bc2d9f9d749a72c14 Mon Sep 17 00:00:00 2001 From: Lorenz Schori Date: Tue, 7 May 2024 11:42:30 +0200 Subject: [PATCH 3/5] Fix copy&paste accident --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index beaaacc..d255cd7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -29,7 +29,7 @@ jobs: python -m pip install --editable .[tests] - name: Test with trial run: | - COVERAGE_PROCESS_START=`pwd`/.coveragerc trial spreadflow_core + COVERAGE_PROCESS_START=`pwd`/.coveragerc trial spreadflow_delta coverage combine `pwd` `pwd`/_trial_temp coverage xml - name: Coveralls Parallel From e17b7029f1b5302e99d331205c8da88db9c26634 Mon Sep 17 00:00:00 2001 From: Lorenz Schori Date: Tue, 7 May 2024 11:47:01 +0200 Subject: [PATCH 4/5] Add coveralls binary --- test-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test-requirements.txt b/test-requirements.txt index a1aa4ae..06f9b46 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,2 @@ -e git+https://github.com/znerol/spreadflow-core@stable#egg=SpreadFlowCore +coveralls From d397e27f9c0a22a71b32690dab24395a9233a593 Mon Sep 17 00:00:00 2001 From: Lorenz Schori Date: Tue, 7 May 2024 14:57:58 +0200 Subject: [PATCH 5/5] No multiprocessing required in spreadflow_delta --- .coveragerc | 11 +++++++++-- .github/workflows/python-package.yml | 5 ++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.coveragerc b/.coveragerc index ee6ec14..76f2838 100644 --- a/.coveragerc +++ b/.coveragerc @@ -3,6 +3,13 @@ [run] branch = True -source = spreadflow_delta +source_pkgs = + spreadflow_delta omit = - spreadflow_delta/test/* + /tmp/** + spreadflow_delta/test/** + +[report] +omit = + /tmp/** + spreadflow_delta/test/** diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index d255cd7..78a7e9a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -29,8 +29,7 @@ jobs: python -m pip install --editable .[tests] - name: Test with trial run: | - COVERAGE_PROCESS_START=`pwd`/.coveragerc trial spreadflow_delta - coverage combine `pwd` `pwd`/_trial_temp + coverage run `which trial` spreadflow_delta coverage xml - name: Coveralls Parallel uses: coverallsapp/github-action@v2