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

Major update 6 #88

Merged
merged 44 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
903a9db
Auto stash before merge of "master" and "origin/master"
AnotherSamWilson Apr 27, 2024
28197bf
Before I start messing with the mean matching logic
AnotherSamWilson May 10, 2024
a0a15d3
updated .gitignore
AnotherSamWilson Jul 20, 2024
baf22ad
Tests are passing, Still need to work on docs
AnotherSamWilson Jul 20, 2024
efcaaba
Now readme
AnotherSamWilson Jul 21, 2024
2b25447
Updated dev environment
AnotherSamWilson Jul 21, 2024
7358167
Added pandoc
AnotherSamWilson Jul 21, 2024
72ccaee
README generated by nbconvert
AnotherSamWilson Jul 21, 2024
99999bc
Changed name of README.ipynb
AnotherSamWilson Jul 21, 2024
0514064
Moved plotting to plotnine
AnotherSamWilson Jul 25, 2024
a1cb818
Took out unecessary functions, changed how cat folds work
AnotherSamWilson Jul 26, 2024
f09ad09
type hinting
AnotherSamWilson Jul 26, 2024
1c4fc0e
Took out unecessary plotting code, changed how dataset names are stored.
AnotherSamWilson Jul 26, 2024
b2c19c4
Took out unecessary functions, fixed bugs in fast mean matching
AnotherSamWilson Jul 26, 2024
feeb316
Moved tuning args over to default_lightgbm_parameters module
AnotherSamWilson Jul 26, 2024
cbd1904
Updated README
AnotherSamWilson Jul 26, 2024
8b848f0
Updated tests for recent changes. Tests are now much more thorough.
AnotherSamWilson Jul 26, 2024
08c9f4c
Updated readme to remove seaborn reference
AnotherSamWilson Jul 26, 2024
22962b0
Updated dependencies, added black formatting check
AnotherSamWilson Jul 26, 2024
8d64c24
Updated dependencies
AnotherSamWilson Jul 26, 2024
bc4d7f0
Committing image files, hopefully I don't regret this.
AnotherSamWilson Jul 26, 2024
44cab66
Ran isort
AnotherSamWilson Jul 26, 2024
c3f5df0
Moved build and project specifications from setup.py to pyproject.toml
AnotherSamWilson Jul 26, 2024
aeef98d
Organized github workflow tests better
AnotherSamWilson Jul 26, 2024
8366755
Took out old files that won't be a problem anymore.
AnotherSamWilson Jul 26, 2024
c3f4f53
Run tests on this branch
AnotherSamWilson Jul 26, 2024
2254441
Fixed syntax in [Install dependencies]
AnotherSamWilson Jul 26, 2024
c502eef
black formatting
AnotherSamWilson Jul 26, 2024
a9032a6
Update dev environment
AnotherSamWilson Jul 26, 2024
8b381d7
New docs
AnotherSamWilson Jul 26, 2024
d8374b2
Updated mypy call
AnotherSamWilson Jul 26, 2024
8967ff8
black formatting
AnotherSamWilson Jul 26, 2024
6a0906d
Black is fighting against mypy
AnotherSamWilson Jul 26, 2024
eaf8b66
Removed unecessary references
AnotherSamWilson Jul 26, 2024
21aaec8
No longer need blosc2
AnotherSamWilson Jul 26, 2024
892d115
Add dill to test dependencies
AnotherSamWilson Jul 26, 2024
b86cfb6
Changed a parameter for better imputation results.
AnotherSamWilson Jul 26, 2024
fca7071
Getting codecov to work
AnotherSamWilson Jul 26, 2024
891f3fd
Fixed bug in tuning
AnotherSamWilson Jul 26, 2024
ec1d8a9
Added tuning to tests
AnotherSamWilson Jul 26, 2024
444f88b
Added pytest-cov to dev dependencies
AnotherSamWilson Jul 26, 2024
62f36c0
Black formatting
AnotherSamWilson Jul 26, 2024
f9b6287
Removed unused scripts
AnotherSamWilson Jul 26, 2024
3b0031e
Added serialization and plotting to tests
AnotherSamWilson Jul 26, 2024
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
15 changes: 0 additions & 15 deletions .coveragerc

This file was deleted.

48 changes: 28 additions & 20 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: tests + mypy

on:
push:
branches: [ "master" ]
branches: [ "major_update_6", "master" ]
pull_request:
branches: [ "master" ]

Expand All @@ -16,28 +16,36 @@ jobs:
matrix:
python-version: ["3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest
pip install mypy
pip install codecov
pip install pytest-cov
pip install blosc2
pip install dill
pip install pandas
pip install seaborn
pip install matplotlib
pip install scipy
pip install scikit-learn
pip install lightgbm
pip install pyarrow
- name: Test with pytest
pip install pytest mypy codecov pytest-cov pandas
pip install plotnine matplotlib scipy scikit-learn
pip install lightgbm pyarrow black isort dill

- name: MyPy Checks
run: mypy miceforest --ignore-missing-imports

- name: Black Formatting - Package
run: black miceforest --check

- name: Black Formatting - Tests
run: black tests --check

- name: Isort Checks
run: isort miceforest --diff

- name: Pytest
run: pytest --cov=miceforest --cov-report html

- name: Upload coverage reports to Codecov
run: |
mypy miceforest
pytest --cov-config .coveragerc --cov-report html --cov=miceforest
codecov
curl -Os https://cli.codecov.io/latest/linux/codecov
chmod +x codecov
./codecov --verbose upload-process --fail-on-error -t ${{ secrets.CODECOV_TOKEN }} -n 'service'-${{ github.run_id }} -F service -f coverage-service.xml

10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ coverage.*
.codecovtoken
examples/icon_small.png
support/
BuildAndInstall.bat
setupdev.py
*/_build/
*.bat
release_commands.txt
dev/
.Rproj.user
miceforest.Rproj
.Rhistory
benchmarks/*
requirements.txt
.venv
poetry.lock
pyproject.toml
*.DS_Store*
.devcontainer
Dockerfile
dev_guide.md
Loading