Skip to content

Commit bc307e8

Browse files
kaspersgitKasper de Harder
and
Kasper de Harder
authored
Bugfix (#50)
* Fixed some window related tests but broken commit due to dt multiclass test * All tests passing * Improved structure, fixed tests on windows, updated some files * Fixed some requirements and versions for succesful tests * Splitted normal and dev requirements and put them in docs/ folder * Slightly simplified setup, updated readmes and ran ruff * Users inputted model name formatting and better auto config creater * Slight rewrite of install package command to do a python -m pip install * Removed double file listing * Updated readme with output of the tool * Updated readme * Added test and ruff formatted * Updated Readme and some tiny edits * Tiny adjustments - non code * Expanded testing and some minor adjustments * Added logo and some minor changes * Improved logger setup, removed as function parameter * Added pre commit ruff and pytest hook * Updated ReadMe and moved some tests * Improved Readme and increased default rows in automatic config maker * Added demo in form of a gif to readme * Forgot gif file * Removed file * First attempt to add local explanations * Added Xi correlation * Added best pracrices on some scripts * Updated packages * Added test and started w github actions * Adjusted github workflow file * Updated requirements * Updated github workflow * spelling mistake * Add venv in github actions * Updated github workflow2 * Add specific os runnable * try 1x * try 2x * try 3x * try 4x * try 4x * try 5x * try 5x * try 6x * try 7x * try 8x * try 9x * github workflow fix v1 * github workflow fix v1 * github workflow fix v2 * github workflow fix v2 * github workflow fix v2 * github workflow fix v3 * github workflow fix v3 * github workflow fix v4 * github workflow fix v5 * github workflow fix v6 * github workflow fix v6 * github workflow fix v7 * github workflow fix v8 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v10 * github workflow fix v10 * github workflow fix v10 * github workflow fix v11 * Wrong checksum error possible fix * Removed change might already have been fixed * Slightly changed test which stucks * Attempt fix github workflow * Attempt fix github workflow v2 * Attempt fix github workflow v3 * Attempt fix github workflow v4 * Attempt fix github workflow v5 * Attempt fix github workflow v5 * Attempt fix github workflow v6 * Attempt fix github workflow v7 * Attempt fix github workflow v8 * Updated requirements files * removed double package in requirements * Initial package creation (#44) * Fixed some window related tests but broken commit due to dt multiclass test * All tests passing * Improved structure, fixed tests on windows, updated some files * Fixed some requirements and versions for succesful tests * Splitted normal and dev requirements and put them in docs/ folder * Slightly simplified setup, updated readmes and ran ruff * Users inputted model name formatting and better auto config creater * Slight rewrite of install package command to do a python -m pip install * Removed double file listing * Updated readme with output of the tool * Updated readme * Added test and ruff formatted * Updated Readme and some tiny edits * Tiny adjustments - non code * Expanded testing and some minor adjustments * Added logo and some minor changes * Improved logger setup, removed as function parameter * Added pre commit ruff and pytest hook * Updated ReadMe and moved some tests * Improved Readme and increased default rows in automatic config maker * Added demo in form of a gif to readme * Forgot gif file * Removed file * First attempt to add local explanations * Added Xi correlation * Added best pracrices on some scripts * Updated packages * Added test and started w github actions * Adjusted github workflow file * Updated requirements * Updated github workflow * spelling mistake * Add venv in github actions * Updated github workflow2 * Add specific os runnable * try 1x * try 2x * try 3x * try 4x * try 4x * try 5x * try 5x * try 6x * try 7x * try 8x * try 9x * github workflow fix v1 * github workflow fix v1 * github workflow fix v2 * github workflow fix v2 * github workflow fix v2 * github workflow fix v3 * github workflow fix v3 * github workflow fix v4 * github workflow fix v5 * github workflow fix v6 * github workflow fix v6 * github workflow fix v7 * github workflow fix v8 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v9 * github workflow fix v10 * github workflow fix v10 * github workflow fix v10 * github workflow fix v11 * Wrong checksum error possible fix * Removed change might already have been fixed * Slightly changed test which stucks * Attempt fix github workflow * Attempt fix github workflow v2 * Attempt fix github workflow v3 * Attempt fix github workflow v4 * Attempt fix github workflow v5 * Attempt fix github workflow v5 * Attempt fix github workflow v6 * Attempt fix github workflow v7 * Attempt fix github workflow v8 * Updated requirements files * removed double package in requirements * Making it a true cli tool * Added option for clean-data command * Updated packages * Moved typer to normal requirements * Slight restructure and included demo files for init * Added adjusted github workflow for CI * Added adjusted github workflow for CI v2 * Fixed CLI command tests * Slightly changed install package command * Slight adjustement github workflow file * Slight adjustement github workflow file * Slight adjustement github workflow file * Updated requirements files * Updated pyproject to not allow numpy 2 as it breaks interpretml * Some precautionary np call updates to work with np2 in the future * Restructured again * Restructured again * Testing out different configs * Testing out different configs * Testing out different configs * Testing out different configs * Another attempt on github action window runner success * Another attempt on github action window runner success * Ready for packaging * ready for release * Bumped version to v0.1.3 * added simple build script and removed old github workflow --------- Co-authored-by: Kasper de Harder <[email protected]> * Hopefully fixed package release * Release v0.1.6 (#45) * Preparing v0.1.6 * Moved back to skip certain tests on github windows runner * Ready for release v0.1.6 --------- * Commiting last changes * Removed file and added some tests * Attempt to fix init command * Just 2 tests failing still * Fixed tests and removed old data structure * git status that is the wrong text * Added pip list command * Fixed scikit - learn version to make tests pass * Bumped up dep package versions and past tests * Bump version to 0.1.7 * Bugfix and updated gif in readme * Updated readme gif * Minor fix docs and improved release process with CI/CD * Bugfix missing package * bumped version --------- Co-authored-by: Kasper de Harder <[email protected]>
1 parent 5e38cd5 commit bc307e8

File tree

7 files changed

+25
-31
lines changed

7 files changed

+25
-31
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
2727
run: twine upload dist/*
2828
- name: Create Release
29-
uses: softprops/action-gh-release@v1
29+
uses: softprops/action-gh-release@v2
3030
with:
3131
files: |
3232
dist/*

CHANGELOG.md

+11-14
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,23 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
8+
## [0.1.8] - 2024-08-13
99

10-
### Added
11-
- Added Kmeans (unsupervised) as model to choose
12-
- Auto test created SQL model vs pickled model
10+
### Fixed
11+
- Bug Fix due to missing required package
1312

14-
### Changed
15-
- For changes in existing functionality.
13+
## [0.1.7] - 2024-08-12
1614

17-
### Deprecated
18-
- For soon-to-be removed features.
15+
### Added
16+
- Support for interpretml 0.6.3
1917

20-
### Removed
21-
- For now removed features.
18+
### Changed
19+
- Testing flow to do end to end for all model problem types combinations
2220

2321
### Fixed
24-
- For any bug fixes.
25-
26-
### Security
27-
- In case of vulnerabilities.
22+
- Fixed error of not working on certain platforms
23+
- Fixed error related to tkinter
24+
- Fixed tests failing due to different reasons
2825

2926
## [0.1.7] - 2024-08-12
3027

Readme.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Machine learning to SQL
2+
![pypi](https://img.shields.io/pypi/v/ml2sql.svg)
23
![GitHub Repo stars](https://img.shields.io/github/stars/kaspersgit/ml_2_sql?style=flat-square)
34
![GitHub last commit](https://img.shields.io/github/last-commit/kaspersgit/ml_2_sql?style=flat-square)
4-
![interpret](https://img.shields.io/badge/interpret-v0.5.1-blue)
5+
![Pypi downloads](https://img.shields.io/pypi/dm/ml2sql)
6+
![interpret](https://img.shields.io/badge/interpret-v0.6.3-blue)
57
![Python Version](https://img.shields.io/pypi/pyversions/interpret.svg?style=flat-square)
68
![GitHub](https://img.shields.io/github/license/kaspersgit/ml_2_sql?style=flat-square)
79

docs/TODO.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Checks and config
2020
- Other
2121
- Add APLR (new model in interpretml)
2222
- Allow for other data file types (apart from csv)
23+
- Increase use of DuckDB (instead of pandas where applicable)
2324
- Test generated SQL vs trained model and report on difference
2425
- Switch decision tree from sklearn to interpret for coherence (wait on [issue 552](https://github.com/interpretml/interpret/issues/522))
2526
- Add calibration (platt scaling/isotonic regression)

docs/devReadMe.md

+7-13
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ In dev branch:
4242
- Merge to master on github (name "Prepare release X.Y.Z")
4343
- Pull master locally
4444
- Add tag (git tag -a vX.Y.Z -m "Release version X.Y.Z")
45-
git add .
46-
git commit -m "Prepare release X.Y.Z"
47-
git tag vX.Y.Z
48-
git push origin main
49-
git push origin vX.Y.Z
45+
- git push origin vX.Y.Z
5046

51-
Build your package
47+
Build your package
48+
(should be done by github action on tag push directly to pypi)
49+
```
5250
rm -rf dist/* # Clean old builds
5351
python -m build
5452
@@ -63,11 +61,7 @@ Ensure it works as expected.
6361
Upload to PyPI
6462
If all tests pass:
6563
twine upload dist/*
64+
```
6665

67-
Verify PyPI installation
68-
pip install ml2sql
69-
70-
Create a GitHub release (if applicable)
71-
Go to your GitHub repository and create a new release based on the tag you just pushed.
72-
73-
Remember to increment your version number appropriately for each release, following semantic versioning principles.
66+
Verify PyPI installation \
67+
`pip install ml2sql`

ml2sql/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# ml2sql/__init__.py
33

44
__app_name__ = "ml2sql"
5-
__version__ = "0.1.7"
5+
__version__ = "0.1.8"

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ classifiers = [
3434
dependencies = [
3535
"interpret == 0.6.3",
3636
"numpy",
37+
"duckdb",
3738
"scikit-learn",
3839
"imblearn",
3940
"kaleido",
@@ -49,7 +50,6 @@ Issues = "https://github.com/kaspersgit/ml_2_sql/issues"
4950

5051
[project.optional-dependencies]
5152
dev = [
52-
"duckdb",
5353
"pytest",
5454
"pytest-mock",
5555
"pip-tools",

0 commit comments

Comments
 (0)