Skip to content

Commit 2a6ef27

Browse files
authored
Revert "Cdc-ap66_badge_ci_fix (#15)"
This reverts commit a634ee4.
1 parent a634ee4 commit 2a6ef27

3 files changed

Lines changed: 90 additions & 78 deletions

File tree

.github/workflows/run_qaqc.yaml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,32 @@ jobs:
2929
run: |
3030
poetry install --no-root --with dev
3131
poetry run pytest
32+
badge:
33+
# only run on pushes to main
34+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
3235

36+
name: update coverage badge
37+
runs-on: ubuntu-latest
38+
39+
# requires the pytest job above
40+
needs: tests
41+
42+
steps:
3343
- name: Build badge
34-
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
3544
run: |
3645
poetry run coverage-badge -f -o docs/assets/badges/coverage.svg
3746
echo '<!-- timestamp: '"$(date '+%Y-%m-%d %H:%M:%S')"' -->' >> docs/assets/badges/coverage.svg
38-
git config user.name "${{ github.actor }}"
39-
git config user.email "${{ github.actor }}@users.noreply.github.com"
40-
git add docs/assets/badges/coverage.svg
41-
git commit -m "Update coverage badge"
42-
git push origin HEAD:${{ github.head_ref }}
47+
48+
- name: Check-in Coverage Badge
49+
run: |
50+
if [ -z "${{ github.head_ref }}" ];
51+
then
52+
echo "Not a pull request, skipping badge update."
53+
exit 0
54+
else
55+
git config user.name "${{ github.actor }}"
56+
git config user.email "${{ github.actor }}@users.noreply.github.com"
57+
git add docs/assets/badges/coverage.svg
58+
git commit -m "Update coverage badge"
59+
git push origin HEAD:${{ github.head_ref }}
60+
fi

changelog.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ The versioning pattern is `YYYY.MM.DD.micro(a/b/{none if release})
88

99
---
1010

11-
## [2025.08.14.1a]
12-
13-
### Fixes
14-
15-
- Conditional coverage badge update only when pulling to main
16-
1711
## [2025.08.14.0a]
1812

1913
- Updates to documentation

pyproject.toml

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
1-
[project]
2-
name = "cfa.dataops"
3-
version = "2025.08.14.1a"
4-
description = "Data cataloging, ETL, modeling, verification, and validation for CFA"
5-
authors = [
6-
{ name = "Phil Rogers", email = "ap66@cdc.gov" },
7-
{ name = "Ryan Raasch", email = "xng3@cdc.gov" },
8-
]
9-
readme = "README.md"
10-
requires-python = ">=3.10,<3.11"
11-
dependencies = [
12-
"cfa-azure @ git+https://github.com/CDCgov/cfa_azure.git",
13-
"tomli (>=2.2.1,<3.0.0)",
14-
"httpx (>=0.28.1,<0.29.0)",
15-
"mako (>=1.3.9,<2.0.0)",
16-
"duckdb (>=1.2.0,<2.0.0)",
17-
"tqdm (>=4.67.1,<5.0.0)",
18-
"pyarrow (>=19.0.1,<20.0.0)",
19-
"fastparquet (>=2024.11.0,<2025.0.0)",
20-
"matplotlib (~=3.9)",
21-
"pandas (>=2.2.3)",
22-
"polars (>=1.26.0)",
23-
"tqdm (>=4.67.0)",
24-
"altair (>=5.5.0,<6.0.0)",
25-
"vl-convert-python (>=1.7.0,<2.0.0)",
26-
"pypdf (>=5.5.0,<6.0.0)",
27-
"dynode @ git+https://github.com/CDCgov/DynODE@main",
28-
"pandera[pandas] (>=0.24.0)",
29-
"papermill (>=2.6.0,<3.0.0)",
30-
"ipywidgets (>=8.1.7,<9.0.0)",
31-
"itables (>=2.4.4,<3.0.0)",
32-
"ipykernel (>=6.30.0,<7.0.0)",
33-
"nbconvert (>=7.16.6,<8.0.0)",
34-
"jupyter (>=1.1.1,<2.0.0)",
35-
"jupyterlab (>=4.4.5,<5.0.0)",
36-
"rich (>=14.1.0,<15.0.0)",
37-
]
38-
39-
[tool.poetry]
40-
packages = [{ include = "cfa" }]
41-
42-
43-
[tool.poetry.group.dev.dependencies]
44-
ruff = "^0.9.9"
45-
pytest = "^8.3.5"
46-
pytest-mock = "^3.14.0"
47-
pytest-cov = "^6.1.1"
48-
hypothesis = "^6.133.0"
49-
faker = "^37.3.0"
50-
coverage-badge = "^1.1.2"
51-
52-
[tool.poetry.group.mkdocs.dependencies]
53-
mkdocs = "^1.6.1"
54-
mkdocs-material = "^9.6.16"
55-
mkdocstrings = { extras = ["python"], version = "^0.30.0" }
56-
mdx-truly-sane-lists = "^1.3"
57-
58-
[build-system]
59-
requires = ["poetry-core>=2.0.0,<3.0.0"]
60-
build-backend = "poetry.core.masonry.api"
61-
62-
[tool.poetry.scripts]
63-
state_report_pdf = "cfa.dataops.workflows.post_processing.state_report_pdf:main"
64-
65-
[tool.pytest.ini_options]
66-
addopts = "--doctest-modules -vv --cov=cfa --cov-report html --cov-report term"
1+
[project]
2+
name = "cfa.dataops"
3+
version = "2025.08.14.0a"
4+
description = "Data cataloging, ETL, modeling, verification, and validation for CFA"
5+
authors = [
6+
{ name = "Phil Rogers", email = "ap66@cdc.gov" },
7+
{ name = "Ryan Raasch", email = "xng3@cdc.gov" },
8+
]
9+
readme = "README.md"
10+
requires-python = ">=3.10,<3.11"
11+
dependencies = [
12+
"cfa-azure @ git+https://github.com/CDCgov/cfa_azure.git",
13+
"tomli (>=2.2.1,<3.0.0)",
14+
"httpx (>=0.28.1,<0.29.0)",
15+
"mako (>=1.3.9,<2.0.0)",
16+
"duckdb (>=1.2.0,<2.0.0)",
17+
"tqdm (>=4.67.1,<5.0.0)",
18+
"pyarrow (>=19.0.1,<20.0.0)",
19+
"fastparquet (>=2024.11.0,<2025.0.0)",
20+
"matplotlib (~=3.9)",
21+
"pandas (>=2.2.3)",
22+
"polars (>=1.26.0)",
23+
"tqdm (>=4.67.0)",
24+
"altair (>=5.5.0,<6.0.0)",
25+
"vl-convert-python (>=1.7.0,<2.0.0)",
26+
"pypdf (>=5.5.0,<6.0.0)",
27+
"dynode @ git+https://github.com/CDCgov/DynODE@main",
28+
"pandera[pandas] (>=0.24.0)",
29+
"papermill (>=2.6.0,<3.0.0)",
30+
"ipywidgets (>=8.1.7,<9.0.0)",
31+
"itables (>=2.4.4,<3.0.0)",
32+
"ipykernel (>=6.30.0,<7.0.0)",
33+
"nbconvert (>=7.16.6,<8.0.0)",
34+
"jupyter (>=1.1.1,<2.0.0)",
35+
"jupyterlab (>=4.4.5,<5.0.0)",
36+
"rich (>=14.1.0,<15.0.0)",
37+
]
38+
39+
[tool.poetry]
40+
packages = [{ include = "cfa" }]
41+
42+
43+
[tool.poetry.group.dev.dependencies]
44+
ruff = "^0.9.9"
45+
pytest = "^8.3.5"
46+
pytest-mock = "^3.14.0"
47+
pytest-cov = "^6.1.1"
48+
hypothesis = "^6.133.0"
49+
faker = "^37.3.0"
50+
coverage-badge = "^1.1.2"
51+
52+
[tool.poetry.group.mkdocs.dependencies]
53+
mkdocs = "^1.6.1"
54+
mkdocs-material = "^9.6.16"
55+
mkdocstrings = { extras = ["python"], version = "^0.30.0" }
56+
mdx-truly-sane-lists = "^1.3"
57+
58+
[build-system]
59+
requires = ["poetry-core>=2.0.0,<3.0.0"]
60+
build-backend = "poetry.core.masonry.api"
61+
62+
[tool.poetry.scripts]
63+
state_report_pdf = "cfa.dataops.workflows.post_processing.state_report_pdf:main"
64+
65+
[tool.pytest.ini_options]
66+
addopts = "--doctest-modules -vv --cov=cfa --cov-report html --cov-report term"

0 commit comments

Comments
 (0)