Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Steven/cleanup #1

Merged
merged 9 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 0 additions & 35 deletions .github/workflows/coverage.yml

This file was deleted.

14 changes: 6 additions & 8 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
name: Integration

on:
workflow_run:
workflows: [Lint-Unit-Test]
types: [completed]
push:
branches:
- main

jobs:
Unit-Integration:
if: ${{ github.event.workflow_run.conclusion == 'success' }}
strategy:
matrix:
python-version: ["3.11"]
Expand All @@ -18,14 +17,13 @@ jobs:
env:
OPSML_TESTING: 1
LOG_LEVEL: DEBUG
OPSML_GCS_TEST_BUCKET: ${{ secrets.OPSML_GCS_TEST_BUCKET }}
GOOGLE_ACCOUNT_JSON_BASE64: ${{ secrets.GOOGLE_ACCOUNT_JSON_BASE64 }}
OPSML_STORAGE_URI: gs://${{ secrets.OPSML_GCS_TEST_BUCKET }}
OPSML_GCS_TEST_BUCKET: ${{ secrets.OPSML_GCS_BUCKET }}
GOOGLE_ACCOUNT_JSON_BASE64: ${{ secrets.GCS_ACCOUNT_BASE64 }}
OPSML_STORAGE_URI: gs://${{ secrets.OPSML_GCS_BUCKET }}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.event.workflow_run.head_sha }}

- name: Install poetry
run: pipx install poetry==${{ matrix.poetry-version }}
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/lint-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
poetry-version: ["1.7.1"]
os: [macos]

runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}-12
env:
OPSML_TESTING: 1
LOG_LEVEL: DEBUG
Expand Down Expand Up @@ -121,11 +121,10 @@ jobs:
make setup.project
make test.unit

- name: Store coverage files
uses: actions/upload-artifact@v3
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4.0.1
with:
name: coverage
path: coverage
token: ${{ secrets.CODECOV_TOKEN }}

Unit-Test-Windows:
needs: Lints
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ test.unit:
--ignore tests/integration \
--cov \
--cov-fail-under=0 \
--cov-report html:coverage \
--cov-report xml:./coverage.xml \
--cov-report term \
--junitxml=./results.xml

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
[![Py-Versions](https://img.shields.io/pypi/pyversions/opsml.svg?color=%2334D058)](https://pypi.org/project/opsml)
[![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
[![Pydantic v2](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/pydantic/pydantic/main/docs/badge/v2.json)](https://docs.pydantic.dev/latest/contributing/#badges)
[![codecov](https://codecov.io/gh/demml/opsml/graph/badge.svg?token=VXY6UJYLDQ)](https://codecov.io/gh/demml/opsml)
[![Pydantic](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/pydantic/pydantic/main/docs/badge/v2.json)](https://docs.pydantic.dev/latest/contributing/#badges)
[![gitleaks](https://img.shields.io/badge/protected%20by-gitleaks-purple)](https://github.com/zricethezav/gitleaks-action)


Expand Down
19 changes: 19 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
comment: false

ignore:
- "tests"
- "python/rusty_logger/version.py"

coverage:
range: "70...100"
status:
patch:
default:
target: 70%
threshold: 10%

project:
default:
target: 70%
threshold: 10%
if_ci_failed: error #success, failure, error, ignore
2,444 changes: 1,209 additions & 1,235 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
name = "opsml"
description = "Python MLOPs quality control tooling for your production ML workflows"
authors = [
{ name = 'Steven Forrester', email = 'steven.forrester@shipt.com' },
{ name = 'Damon Allison', email = 'damon@shipt.com' },
{ name = 'Steven Forrester', email = 'steven.forrester@shipt.com' }
]
readme = "README.md"
license = 'MIT'
Expand Down Expand Up @@ -143,7 +142,7 @@ coverage = { extras = ["toml"], version = "^6.5.0" }
torch = "^2.1.0"
torchvision = "^0.16"
#tabulate = "^0.9.0"
lightgbm = "^3.3.3, <4.0.0"
lightgbm = "^4"
xgboost = "^1.7.1"
transformers = "^4.27.3"
tensorflow = { version = "^2.11.0", platform = "linux" }
Expand Down Expand Up @@ -317,4 +316,4 @@ max-complexity = 10

[build-system]
requires = ["poetry-core>=1.2.2"]
build-backend = "poetry.core.masonry.api"
build-backend = "poetry.core.masonry.api"
Loading