From a4486940ce556a42bb804d188d2015e047dfc3c1 Mon Sep 17 00:00:00 2001 From: Taylor Turner Date: Mon, 20 May 2024 10:03:39 -0400 Subject: [PATCH] Version.py update 0.11.0 (#1139) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replace snappy with cramjam (#1091) * add downloads tile (#1085) * Replace snappy with cramjam * Delete test_no_snappy --------- Co-authored-by: Taylor Turner * Quick fix for dependency max pins (#1120) * Fix dask_expr * Keras and Tensorflow version fix * Keras and Tensorflow version fix * Fix keras bug * pre-commit fix (#1122) * docs: update test link to latest version (#1114) * docs: add contributor notes on where to find documentation branches (#1113) * docs: add contributor notes on where to find documentation branches * docs: update documentation wording to spell out why `dev-gh-pages` and `gh-pages` branches exist for staging content * docs: add note on fork Co-authored-by: Taylor Turner * Update .github/CONTRIBUTING.md Co-authored-by: Taylor Turner --------- Co-authored-by: Taylor Turner * update black version (#1131) * Add memray max version (#1132) * Bug fix for float precision calculation using categorical data with trailing zeros. (#1125) * Revert "Bug fix for float precision calculation using categorical data with t…" (#1133) This reverts commit d3159bd13911892e74c264966fba011d50f20e95. * fix * make up to date * yep, shouldn't change * bump version --------- Co-authored-by: Gábor Lipták Co-authored-by: abajpai15 <73404357+abajpai15@users.noreply.github.com> Co-authored-by: Patrick Carlson Co-authored-by: James Schadt --- .github/CONTRIBUTING.md | 7 ++++++- .pre-commit-config.yaml | 10 +++++----- dataprofiler/version.py | 4 ++-- requirements-dev.txt | 2 +- requirements-ml.txt | 8 ++++---- requirements-test.txt | 4 ++-- 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6ec552955..57263647a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -48,7 +48,7 @@ To execute unit tests, run the following DATAPROFILER_SEED=0 python3 -m unittest discover -p "test*.py" ``` -For more nuanced testing runs, check out more detailed documentation [here](https://capitalone.github.io/DataProfiler/docs/0.8.1/html/install.html#testing). +For more nuanced testing runs, check out more detailed documentation [here](https://capitalone.github.io/DataProfiler/docs/0.11.0/html/install.html#testing). ## Creating [Pull Requests](https://github.com/capitalone/DataProfiler/pulls) Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests: @@ -106,3 +106,8 @@ the documentation. ## Updating Dependencies If you make changes to the `requirements` text files, please also update the `additional_dependencies` list under the `mypy` hook in `.pre-commit-config.yaml`. This is necessary for accurate type-checking. + +## Contributing Documentation Changes and Fixes +When making adjustments or contributions to documentation, please use the `dev-gh-pages` branch. This is where all the documentation lives. +After you've completed your edits, open a Github Pull Request (PR) to merge into `dev-gh-pages` from your fork. During a version release, `dev-gh-pages` is merged +into the `gh-pages` branch (after `update_documentation.py` is run) and is the version associated with the documentation website and stable version. diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 203e62b1f..7baeb59ec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -80,11 +80,11 @@ repos: # requirements-ml.txt scikit-learn>=0.23.2, - keras>=2.4.3, + 'keras>=2.4.3,<3.0.0', rapidfuzz>=2.6.1, - tensorflow>=2.6.4; sys.platform != 'darwin', - tensorflow>=2.6.4; sys_platform == 'darwin' and platform_machine != 'arm64', - tensorflow-macos>=2.6.4; sys_platform == 'darwin' and platform_machine == 'arm64', + "tensorflow>=2.6.4,<2.15.0; sys.platform != 'darwin'", + "tensorflow>=2.6.4,<2.15.0; sys_platform == 'darwin' and platform_machine != 'arm64'", + "tensorflow-macos>=2.6.4,<2.15.0; sys_platform == 'darwin' and platform_machine == 'arm64'", tqdm>=4.0.0, # requirements-reports.txt @@ -100,7 +100,7 @@ repos: pytest-xdist>=2.1.0, pytest-forked>=1.3.0, toolz>=0.10.0, - memray>=1.7.0, + 'memray>=1.7.0,<1.12.0', ] # Check-manifest: ensures required non-Python files are included in MANIFEST.in # https://github.com/mgedmin/check-manifest/blob/master/.pre-commit-hooks.yaml diff --git a/dataprofiler/version.py b/dataprofiler/version.py index 86e35b807..1136efae1 100644 --- a/dataprofiler/version.py +++ b/dataprofiler/version.py @@ -1,8 +1,8 @@ """File contains the version number for the package.""" MAJOR = 0 -MINOR = 10 -MICRO = 9 +MINOR = 11 +MICRO = 0 POST = None # otherwise None VERSION = "%d.%d.%d" % (MAJOR, MINOR, MICRO) diff --git a/requirements-dev.txt b/requirements-dev.txt index 1d76f7b1f..cff8f51a0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ check-manifest>=0.48 -black==22.3.0 +black>=24.3.0 isort==5.12.0 pre-commit==2.19.0 tox==3.25.1 diff --git a/requirements-ml.txt b/requirements-ml.txt index 08e1312aa..ff525fec1 100644 --- a/requirements-ml.txt +++ b/requirements-ml.txt @@ -1,7 +1,7 @@ scikit-learn>=0.23.2 -keras>=2.4.3 +keras>=2.4.3,<3.0.0 rapidfuzz>=2.6.1 -tensorflow>=2.6.4; sys.platform != 'darwin' -tensorflow>=2.6.4; sys_platform == 'darwin' and platform_machine != 'arm64' -tensorflow-macos>=2.6.4; sys_platform == 'darwin' and platform_machine == 'arm64' +tensorflow>=2.6.4,<2.15.0; sys.platform != 'darwin' +tensorflow>=2.6.4,<2.15.0; sys_platform == 'darwin' and platform_machine != 'arm64' +tensorflow-macos>=2.6.4,<2.15.0; sys_platform == 'darwin' and platform_machine == 'arm64' tqdm>=4.0.0 diff --git a/requirements-test.txt b/requirements-test.txt index df4be852e..6c981cf9c 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,9 +1,9 @@ coverage>=5.0.1 -dask>=2.29.0 +dask>=2.29.0,<2024.2.0 fsspec>=0.3.3 pytest>=6.0.1 pytest-cov>=2.8.1 pytest-xdist>=2.1.0 pytest-forked>=1.3.0 toolz>=0.10.0 -memray>=1.7.0 +memray>=1.7.0,<1.12.0