Skip to content

Commit

Permalink
Merge pull request #268 from BCDA-APS/136-coveralls
Browse files Browse the repository at this point in the history
re-enable coveralls
  • Loading branch information
prjemian authored Feb 16, 2024
2 parents 5bc4008 + c1b58e0 commit 11b4afb
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 46 deletions.
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Set update schedule for GitHub Actions
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
110 changes: 64 additions & 46 deletions .github/workflows/unit-tests-pytest.yml → .github/workflows/code.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Unit Tests
name: CI

on:
# Triggers the workflow on push or pull request events but only for the main branch
Expand All @@ -17,29 +17,36 @@ defaults:
jobs:

lint:
name: Code style
name: Linting & Code style
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"

- name: Install Dependencies
- name: Install package
run: |
which python
which pip
set -vxeuo pipefail
python -m pip install --upgrade pip
pip install flake8
pip install ruff flake8
- name: Run flake8
run: |
flake8
test-matrix:
name: Python ${{ matrix.python-version }}
run: flake8

# # TODO: will replace flake8
# - name: Run ruff
# uses: davidslusser/[email protected]
# with:
# # src: "."
# # options: "--cov=src"
# pip_install_command: "pip install -e .[dev]"
# python_version: "3.11"

tests:
name: CI py${{ matrix.python-version }}
runs-on: ubuntu-latest
needs: lint
strategy:
Expand All @@ -49,14 +56,17 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
# - "3.12" # 2023-Q4 wait for upstreams to be ready
max-parallel: 5

steps:
- name: Set time zone
run: echo "TZ=America/Chicago" >> "$GITHUB_ENV"

- name: Checkout the project from GitHub
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Diagnostics
run: |
Expand Down Expand Up @@ -129,6 +139,7 @@ jobs:
- name: Run Bluesky queueserver
run: |
set -vxeuo pipefail
conda env list
pushd ./bluesky/
bash ./qserver.sh run &
Expand All @@ -140,37 +151,44 @@ jobs:
- name: Run tests with pytest & coverage
run: |
set -vxeuo pipefail
coverage run --concurrency=thread --parallel-mode -m pytest -vvv .
coverage combine
coverage report --precision 3
# - name: Gather coverage data from matrix run
# shell: bash -l {0}
# run: |
# micromamba list coveralls
# which coveralls
# coveralls debug
# coveralls --service=github
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# COVERALLS_FLAG_NAME: ${{ matrix.test-name }}
# COVERALLS_PARALLEL: true

# # https://coveralls-python.readthedocs.io/en/latest/usage/configuration.html#github-actions-support
# coveralls:
# name: Report unit test coverage to coveralls
# needs: test-matrix
# runs-on: ubuntu-latest
# container: python:3-slim

# steps:
# - name: Gather coverage and report to Coveralls
# run: |
# echo "Finally!"
# pip3 install --upgrade coveralls
# # debug mode: output prepared json and reported files list to stdout
# # https://coveralls-python.readthedocs.io/en/latest/troubleshooting.html
# # coveralls debug
# coveralls --service=github --finish
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
python -m coverage report --precision 3
- name: Force Install coveralls by pip
shell: bash -l {0}
run: |
python -m pip install --force-reinstall coveralls
- name: Upload coverage data to coveralls.io
shell: bash -l {0}
run: |
set -vxeuo pipefail
python -m coveralls debug
python -m coveralls --service=github
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_FLAG_NAME: ${{ matrix.python-version }}
COVERALLS_PARALLEL: true

# https://coveralls-python.readthedocs.io/en/latest/usage/configuration.html#github-actions-support
coveralls:
name: Report unit test coverage to coveralls
needs: tests
runs-on: ubuntu-latest
container: python:3-slim

steps:
- name: Gather coverage and report to Coveralls
run: |
set -vxeuo pipefail
echo "Finally!"
pip3 install --upgrade coveralls
# debug mode: output prepared json and reported files list to stdout
# https://coveralls-python.readthedocs.io/en/latest/troubleshooting.html
coveralls debug
coveralls --service=github --finish
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ dependencies:
- uvicorn

- pip:
- ophyd-registry
- tiled

- https://github.com/BCDA-APS/adl2pydm/archive/main.zip
Expand Down

0 comments on commit 11b4afb

Please sign in to comment.