From 77321777f6f409c9c6013b10b1ef65b5df4fdc50 Mon Sep 17 00:00:00 2001 From: "Leandro G. Almeida" Date: Thu, 25 Mar 2021 16:53:58 -0700 Subject: [PATCH 1/3] fix req and dev readme with protobuf step --- DEVELOPMENT.md | 29 ++++++---- requirements-dev.txt | 133 +++++++++++-------------------------------- 2 files changed, 49 insertions(+), 113 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 0d01bffb85..78353fc13d 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -56,13 +56,26 @@ make clean pip install -r requirements-dev.txt ``` -8. Install whylogs in editable mode to the current python environment +8. Install protobuf compiler + + - On Mac OS + ``` + brew install protobuf + ``` + + - On Ubuntu + ``` + apt install protobuf + ``` + + +9. Install whylogs in editable mode to the current python environment ``` make develop ``` -9. (optional) Build and serve documentation +10. (optional) Build and serve documentation ``` make docs @@ -80,14 +93,6 @@ make test ``` -### Coverage - -Coverage can be checked with - -``` -make coverage -``` - ### Testing CI locally you can run local github actions on the ubuntu using https://github.com/nektos/act. Currently you need to build a latest docker image for ubuntu using the following dockerfile @@ -143,7 +148,7 @@ make test-all ``` You can keep bumping the local version if you need to (you can't republish a version twice so this is needed). -### 2. Pushing to master branch +### 2. Pushing to mainline branch * If you are planning to push to `master` branch, please first create a dev version (see the above guide). **You'll have to bump it to a `beta` version or the build will fail**. You'll need to do this before creating the merge request: @@ -182,7 +187,7 @@ make test-all ## Examples See the `scripts/` directory for some example scripts for interacting with `whylogs-python` -See the `notebooks/` directory for some example notebooks. +See the `examples/notebooks/` directory for some example notebooks. ## Documentation diff --git a/requirements-dev.txt b/requirements-dev.txt index 6ac5107a86..fc3acac20c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,120 +1,51 @@ -alembic==1.4.1 -appdirs==1.4.4 -appnope==0.1.2 -argh==0.26.2 -attrs==20.3.0 -azure-core==1.9.0 -azure-storage-blob==12.6.0 -backcall==0.2.0 +argh>=0.26 +autoapi>=2.0.1 black==20.8b1 -boto3==1.16.28 -botocore==1.19.28 -certifi==2020.11.8 -cffi==1.14.4 -cfgv==3.2.0 -chardet==3.0.4 +boto3==1.16.63 +botocore==1.19.63 +certifi==2020.12.5 click==8.0.0a1 -cloudpickle==1.6.0 -colorama==0.4.4 -coverage==5.3 -cryptography==3.3.2 -cycler==0.10.0 -scikit-learn==0.24.1 -databricks-cli==0.14.1 -decorator==4.4.2 -distlib==0.3.1 -docker==4.4.0 -docutils==0.16 -entrypoints==0.3 -filelock==3.0.12 -Flask==1.1.2 -fsspec==0.8.4 -gitdb==4.0.5 -GitPython==3.1.11 -gunicorn==20.0.4 -identify==1.5.10 -idna==2.10 -importlib-metadata==3.1.1 -iniconfig==1.1.1 +coverage==5.4 +flake8==3.9.0 +freezegun==1.1.0 +fsspec==0.8.5 ipykernel==5.3.4 -ipython==7.19.0 -ipython-genutils==0.2.0 -isodate==0.6.0 -itsdangerous==1.1.0 jmespath==0.10.0 -jupyter-client==6.1.7 -jupyter-core==4.7.0 -keyring==21.5.0 -kiwisolver==1.3.1 -Mako==1.1.3 -MarkupSafe==1.1.1 -marshmallow==3.9.1 +marshmallow==3.10.0 matplotlib==3.3.3 -mlflow==1.12.1 -msrest==0.6.19 -mypy-extensions==0.4.3 -nodeenv==1.5.0 +mlflow==1.13.1 +moto==1.3.16 numpy==1.19.4 -oauthlib==3.1.0 -packaging==20.7 +openpyxl==3.0.6 pandas==1.2.1 -parso==0.7.1 -pathspec==0.8.1 -pexpect==4.8.0 -pickleshare==0.7.5 Pillow==8.1.1 -pkginfo==1.6.1 -pluggy==0.13.1 pre-commit==2.9.2 -prometheus-client==0.9.0 -prometheus-flask-exporter==0.18.1 -prompt-toolkit==3.0.8 protobuf==3.15.6 -ptyprocess==0.6.0 -py==1.10.0 +puremagic ==1.10 pyarrow==2.0.0 -pycparser==2.20 -Pygments==2.7.2 -pyparsing==2.4.7 -pytest==6.1.2 -pytest-cov==2.10.1 -pytest-runner==5.3 +pytest-cov>=2.11.1 +pytest-runner>=5.2 +pytest==6.2.2 python-dateutil==2.8.1 -python-editor==1.0.4 -pytz==2020.4 +pytz==2020.5 PyYAML==5.4 -pyzmq==20.0.0 -querystring-parser==1.2.4 -readme-renderer==28.0 -regex==2020.11.13 -requests==2.25.0 -requests-oauthlib==1.3.0 -requests-toolbelt==0.9.1 -rfc3986==1.4.0 -s3transfer==0.3.3 +s3transfer==0.3.4 +scikit-learn==0.24.1 setuptools-black==0.1.5 six==1.15.0 -smmap==3.0.4 -SQLAlchemy==1.3.20 -sqlparse==0.4.1 -tabulate==0.8.7 -toml==0.10.2 -tornado==6.1 +smart-open==4.1.2 +sphinx-autoapi>=1.4.0 +sphinx-autorun >= 1.1.1 +sphinx-gallery >= 0.8.0 +sphinx-gitstamp>=0.3.1 +sphinx>=2.1 +sphinx_autodoc_typehints +sphinx_rtd_theme>=0.4.3 +sphinxcontrib-contentui>=0.2.4 +sybil>=1.2.1 tqdm==4.54.0 -traitlets==5.0.5 +tox==3.23.0 twine==3.2.0 -typed-ast==1.4.1 -typing-extensions==3.7.4.3 urllib3==1.26.3 -virtualenv==20.2.1 -wcwidth==0.2.5 -webencodings==0.5.1 -websocket-client==0.57.0 -Werkzeug==1.0.1 whylabs-datasketches==2.2.0b1 -zipp==3.4.0 -puremagic == 1.10 -xlrd==2.0.1 -openpyxl==3.0.6 -tqdm==4.54.0 -smart-open==4.1.2 +xlrd==2.0.1 \ No newline at end of file From a6ef482911eb64ffd41034dac1d820281b12ddc9 Mon Sep 17 00:00:00 2001 From: "Leandro G. Almeida" Date: Tue, 30 Mar 2021 10:26:32 -0700 Subject: [PATCH 2/3] fix ubuntu package name --- DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 78353fc13d..e9166c837a 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -65,7 +65,7 @@ make clean - On Ubuntu ``` - apt install protobuf + apt install protobuf-compiler ``` From 6ed653e8765eadbc997677efea0ca8255dc01d1e Mon Sep 17 00:00:00 2001 From: "Leandro G. Almeida" Date: Tue, 30 Mar 2021 10:26:49 -0700 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=200.4.1-dev0=20=E2=86=92=20?= =?UTF-8?q?0.4.2-dev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/conf.py | 2 +- setup.cfg | 2 +- src/whylogs/_version.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cef94096b1..a945712964 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.1-dev0 +current_version = 0.4.2-dev0 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\-(?P[a-z]+)(?P\d+))? diff --git a/docs/conf.py b/docs/conf.py index bba7e90bf7..54150c7c82 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -101,7 +101,7 @@ # built documents. # # The short X.Y version. -version = "0.4.1-dev0" +version = "0.4.2-dev0" # The full version, including alpha/beta/rc tags. release = "" # Is set by calling `setup.py docs` diff --git a/setup.cfg b/setup.cfg index 25b1fb2703..6893493b2f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,7 +4,7 @@ [metadata] name = whylogs -version = 0.4.1-dev0 +version = 0.4.2-dev0 description = Profile and monitor your ML data pipeline end-to-end author = WhyLabs.ai author-email = support@whylabs.ai diff --git a/src/whylogs/_version.py b/src/whylogs/_version.py index 74c21bd0c9..04998907aa 100644 --- a/src/whylogs/_version.py +++ b/src/whylogs/_version.py @@ -1,3 +1,3 @@ """WhyLabs version number.""" -__version__ = "0.4.1-dev0" +__version__ = "0.4.2-dev0"