From 1492183627b351a578f201b065d7b900595e2696 Mon Sep 17 00:00:00 2001 From: Luis Aguirre Date: Fri, 16 Sep 2022 18:15:42 -0400 Subject: [PATCH] Bump version --- .github/workflows/main.yml | 2 +- .pyup.yml | 2 +- Dockerfile | 6 +++--- Dockerfile.coiled | 2 +- Dockerfile.gpu-coiled | 2 +- README.md | 22 +++++++++++----------- README_for_devs.md | 12 ++++++------ conda/recipes/optimus-cudf/meta.yaml | 4 ++-- conda/recipes/optimus-dask/meta.yaml | 4 ++-- conda/recipes/optimus-pandas/meta.yaml | 4 ++-- conda/recipes/optimus-spark/meta.yaml | 4 ++-- examples/examples.md | 8 ++++---- optimus/_version.py | 2 +- readme/readme_.md | 20 ++++++++++---------- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37fc176af..5dfc29bc3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ on: pull_request: branches: - main - - develop-22.6 + - develop-22.9 jobs: build: diff --git a/.pyup.yml b/.pyup.yml index 851d23574..58ba676a7 100644 --- a/.pyup.yml +++ b/.pyup.yml @@ -1,3 +1,3 @@ update: insecure -branch: develop-22.6 +branch: develop-22.9 schedule: "every two weeks on monday" \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 6683deb95..30948c208 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,12 +24,12 @@ RUN sudo chown -R root ~/anaconda3/bin && \ conda install -c conda-forge jupyter_kernel_gateway && \ conda clean -afy -RUN echo "Version 22.6.0-beta3" +RUN echo "Version 22.9.0-beta" RUN pip install cytoolz && \ pip install llvmlite --ignore-installed && \ - pip install git+https://github.com/hi-primus/optimus.git@develop-22.6#egg=pyoptimus[pandas] && \ - pip install git+https://github.com/hi-primus/optimus.git@develop-22.6#egg=pyoptimus[dask] + pip install git+https://github.com/hi-primus/optimus.git@develop-22.9#egg=pyoptimus[pandas] && \ + pip install git+https://github.com/hi-primus/optimus.git@develop-22.9#egg=pyoptimus[dask] CMD jupyter notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root diff --git a/Dockerfile.coiled b/Dockerfile.coiled index b52ebb550..82a53f2cd 100644 --- a/Dockerfile.coiled +++ b/Dockerfile.coiled @@ -10,7 +10,7 @@ RUN conda install libmagic && \ conda clean -afy RUN pip install aiohttp --no-cache-dir && \ - pip install git+https://github.com/hi-primus/optimus.git@develop-22.6 --no-cache-dir + pip install git+https://github.com/hi-primus/optimus.git@develop-22.9 --no-cache-dir diff --git a/Dockerfile.gpu-coiled b/Dockerfile.gpu-coiled index 39e3fa8cc..5b3767c47 100644 --- a/Dockerfile.gpu-coiled +++ b/Dockerfile.gpu-coiled @@ -12,4 +12,4 @@ RUN conda install libmagic && \ RUN pip install aiohttp --no-cache-dir && \ pip install cupy-cuda102 --no-cache-dir && \ pip install dask-cuda --no-cache-dir && \ - pip install git+https://github.com/hi-primus/optimus.git@develop-22.6 --no-cache-dir + pip install git+https://github.com/hi-primus/optimus.git@develop-22.9 --no-cache-dir diff --git a/README.md b/README.md index 5e9968ed2..cb01fb3fb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Optimus -[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/images/optimus-logo.png)](https://hi-optimus.com) +[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/images/optimus-logo.png)](https://hi-optimus.com) [![Tests](https://github.com/hi-primus/optimus/actions/workflows/main.yml/badge.svg)](https://github.com/hi-primus/optimus/actions/workflows/main.yml) [![Docker image updated](https://github.com/hi-primus/optimus/actions/workflows/docker.yml/badge.svg)](https://hub.docker.com/r/hiprimus/optimus) @@ -30,7 +30,7 @@ Some amazing things Optimus can do for you: ## Try Optimus To launch a live notebook server to test optimus using binder or Colab, click on one of the following badges: -[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hi-primus/optimus/develop-22.6?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-22.6%2Fexamples%2F10_min_to_optimus.ipynb) +[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hi-primus/optimus/develop-22.9?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-22.9%2Fexamples%2F10_min_to_optimus.ipynb) [![Colab](https://img.shields.io/badge/launch-colab-yellow.svg?logo=googlecolab&color=e6a210)](https://colab.research.google.com/github/hi-primus/optimus/blob/master/examples/10_min_to_optimus_colab.ipynb) ## Installation (pip): @@ -51,12 +51,12 @@ By default Optimus install Pandas as the default engine, to install other engine To install from the repo: ``` -pip install git+https://github.com/hi-primus/optimus.git@develop-22.6 +pip install git+https://github.com/hi-primus/optimus.git@develop-22.9 ``` To install other engines: ``` -pip install git+https://github.com/hi-primus/optimus.git@develop-22.6#egg=pyoptimus[dask] +pip install git+https://github.com/hi-primus/optimus.git@develop-22.9#egg=pyoptimus[dask] ``` @@ -66,11 +66,11 @@ pip install git+https://github.com/hi-primus/optimus.git@develop-22.6#egg=pyopti ## Examples -You can go to [10 minutes to Optimus](https://github.com/hi-primus/optimus/blob/develop-22.6/examples/10_min_to_optimus.ipynb) where you can find the basics to start working in a notebook. +You can go to [10 minutes to Optimus](https://github.com/hi-primus/optimus/blob/develop-22.9/examples/10_min_to_optimus.ipynb) where you can find the basics to start working in a notebook. -Also you can go to the [Examples](https://github.com/hi-primus/optimus/tree/develop-22.6/examples/examples.md) section and find specific notebooks about data cleaning, data munging, profiling, data enrichment and how to create ML and DL models. +Also you can go to the [Examples](https://github.com/hi-primus/optimus/tree/develop-22.9/examples/examples.md) section and find specific notebooks about data cleaning, data munging, profiling, data enrichment and how to create ML and DL models. -Here's a handy [Cheat Sheet](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-22.6/docs/cheatsheet/optimus_cheat_sheet.html) with the most common Optimus' operations. +Here's a handy [Cheat Sheet](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-22.9/docs/cheatsheet/optimus_cheat_sheet.html) with the most common Optimus' operations. ## Start Optimus @@ -93,7 +93,7 @@ df = op.load.csv("../examples/data/foo.csv") df = op.load.json("../examples/data/foo.json") # using a url -df = op.load.json("https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/examples/data/foo.json") +df = op.load.json("https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/examples/data/foo.json") # parquet df = op.load.parquet("../examples/data/foo.parquet") @@ -136,7 +136,7 @@ Using `display` you have a beautiful way to show your data with extra informatio ```python display(df) ``` -![](https://github.com/hi-primus/optimus/tree/develop-22.6/readme/images/table.png) +![](https://github.com/hi-primus/optimus/tree/develop-22.9/readme/images/table.png) ## Cleaning and Processing @@ -171,7 +171,7 @@ Also if you want to a suggestion or feature request use https://github.com/hi-pr ## Troubleshooting -If you have issues, see our [Troubleshooting Guide](https://github.com/hi-primus/optimus/tree/develop-22.6/troubleshooting.md) +If you have issues, see our [Troubleshooting Guide](https://github.com/hi-primus/optimus/tree/develop-22.9/troubleshooting.md) # Contributing to Optimus 💡 @@ -181,7 +181,7 @@ including: * [Documentation](https://docs.hi-optimus.com/en/latest/) updates, enhancements, designs, or bugfixes. * Spelling or grammar fixes. * README.md corrections or redesigns. -* Adding unit, or functional [tests](https://github.com/hi-primus/optimus/tree/develop-22.6/tests) +* Adding unit, or functional [tests](https://github.com/hi-primus/optimus/tree/develop-22.9/tests) * Triaging GitHub issues -- especially determining whether an issue still persists or is reproducible. * [Blogging, speaking about, or creating tutorials](https://hioptimus.com/category/blog/) about Optimus and its many features. * Helping others on our official chats diff --git a/README_for_devs.md b/README_for_devs.md index a991399a7..6ec4826e6 100644 --- a/README_for_devs.md +++ b/README_for_devs.md @@ -101,7 +101,7 @@ twine upload dist/* ### Installing from github ``` -pip install --upgrade --no-deps --force-reinstall git+https://github.com/hi-primus/optimus.git@develop-22.6 +pip install --upgrade --no-deps --force-reinstall git+https://github.com/hi-primus/optimus.git@develop-22.9 ``` ### Compiling redis .jar file @@ -125,7 +125,7 @@ Here the workflow. ``` https://github.com/hi-primus/optimus.git cd Optimus -git checkout develop-22.6 +git checkout develop-22.9 ``` From PyCharm create a Deployment using a private key and point it to you Optimus folder in the server Be sure to create a mapping so you can sync the local files with the remote server @@ -148,7 +148,7 @@ On Digital Ocean sudo apt-get update sudo apt-get install -y python3-pip sudo apt install libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext cmake gcc -pip install --upgrade --force-reinstall git+https://github.com/hi-primus/optimus.git@develop-22.6 +pip install --upgrade --force-reinstall git+https://github.com/hi-primus/optimus.git@develop-22.9 pip install dask[complete] @@ -215,7 +215,7 @@ This applies to: * Load operations at `optimus/engines/**/io/load.py`: used in `op.load.*()` functions. * Save operations at `optimus/engines/**/io/save.py` -![Inheritance](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/readme/images/inheritance.jpg) +![Inheritance](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/readme/images/inheritance.jpg) #### Tips One common job inside a function is handling what columns are going to be processed and where we are going to put the output data. @@ -278,14 +278,14 @@ conda-build optimus -c rapidsai -c nvidia -c conda-forge -c defaults -c h2oai Search for the message ``` -anaconda upload C:\Users\argenisleon\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-22.6.0-py_0.tar.bz2 +anaconda upload xxxxxx\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-22.9.0-py_0.tar.bz2 ``` then upload the package to Anaconda ``` conda install anaconda-client anaconda login -anaconda upload -u optimus xxxxxx\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-22.6.0-py_0.tar.bz2 +anaconda upload -u optimus xxxxxx\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-22.9.0-py_0.tar.bz2 ``` use your anaconda credentials for https://anaconda.org/ diff --git a/conda/recipes/optimus-cudf/meta.yaml b/conda/recipes/optimus-cudf/meta.yaml index b0030ba60..0de85300e 100644 --- a/conda/recipes/optimus-cudf/meta.yaml +++ b/conda/recipes/optimus-cudf/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "22.6.0" %} +{% set version = "22.9.0" %} package: name: optimus @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/hi-primus/optimus - git_rev: develop-22.6 + git_rev: develop-22.9 git_depth: 1 # (Defaults to -1/not shallow) build: diff --git a/conda/recipes/optimus-dask/meta.yaml b/conda/recipes/optimus-dask/meta.yaml index b0030ba60..0de85300e 100644 --- a/conda/recipes/optimus-dask/meta.yaml +++ b/conda/recipes/optimus-dask/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "22.6.0" %} +{% set version = "22.9.0" %} package: name: optimus @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/hi-primus/optimus - git_rev: develop-22.6 + git_rev: develop-22.9 git_depth: 1 # (Defaults to -1/not shallow) build: diff --git a/conda/recipes/optimus-pandas/meta.yaml b/conda/recipes/optimus-pandas/meta.yaml index 64b8a8b0c..879fe1c80 100644 --- a/conda/recipes/optimus-pandas/meta.yaml +++ b/conda/recipes/optimus-pandas/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "22.6.0" %} +{% set version = "22.9.0" %} package: name: optimus @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/hi-primus/optimus - git_rev: develop-22.6 + git_rev: develop-22.9 git_depth: 1 # (Defaults to -1/not shallow) build: diff --git a/conda/recipes/optimus-spark/meta.yaml b/conda/recipes/optimus-spark/meta.yaml index b0030ba60..0de85300e 100644 --- a/conda/recipes/optimus-spark/meta.yaml +++ b/conda/recipes/optimus-spark/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "22.6.0" %} +{% set version = "22.9.0" %} package: name: optimus @@ -6,7 +6,7 @@ package: source: git_url: https://github.com/hi-primus/optimus - git_rev: develop-22.6 + git_rev: develop-22.9 git_depth: 1 # (Defaults to -1/not shallow) build: diff --git a/examples/examples.md b/examples/examples.md index 6672d9413..1db268a21 100644 --- a/examples/examples.md +++ b/examples/examples.md @@ -4,9 +4,9 @@ Column transforming and some aggregation operations including advanced ones like `set`. -[HTML Preview](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-22.6/examples/column.html) +[HTML Preview](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-22.9/examples/column.html) -[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/examples/column.ipynb) +[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/examples/column.ipynb) # Outdated examples @@ -14,10 +14,10 @@ Column transforming and some aggregation operations including advanced ones like Row operations (Outdated). -[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/examples/row.ipynb) +[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/examples/row.ipynb) ## Plots Display plots from your dataframes (Outdated). -[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/examples/plot.ipynb) \ No newline at end of file +[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/examples/plot.ipynb) \ No newline at end of file diff --git a/optimus/_version.py b/optimus/_version.py index 93c616d3f..b44a2861a 100644 --- a/optimus/_version.py +++ b/optimus/_version.py @@ -1,2 +1,2 @@ -__version__ = '22.6.0-beta3' +__version__ = '22.9.0-beta' VERSION = tuple(int(i) if i.isdigit() else i for i in __version__.split('.')) diff --git a/readme/readme_.md b/readme/readme_.md index 53767f8fb..8c38e695a 100644 --- a/readme/readme_.md +++ b/readme/readme_.md @@ -15,7 +15,7 @@ jupyter: # Optimus -[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/images/optimus-logo.png)](https://hi-optimus.com) +[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/images/optimus-logo.png)](https://hi-optimus.com) [![Tests](https://github.com/hi-primus/optimus/actions/workflows/main.yml/badge.svg)](https://github.com/hi-primus/optimus/actions/workflows/main.yml) [![Docker image updated](https://github.com/hi-primus/optimus/actions/workflows/docker.yml/badge.svg)](https://hub.docker.com/r/hiprimus/optimus) @@ -35,7 +35,7 @@ jupyter: To launch a live notebook server to test optimus using binder or Colab, click on one of the following badges: -[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hi-primus/optimus/develop-22.6?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-22.6%2Fexamples%2F10_min_to_optimus.ipynb) +[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hi-primus/optimus/develop-22.9?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-22.9%2Fexamples%2F10_min_to_optimus.ipynb) [![Colab](https://img.shields.io/badge/launch-colab-yellow.svg?logo=googlecolab&color=e6a210)](https://colab.research.google.com/github/hi-primus/optimus/blob/master/examples/10_min_to_optimus_colab.ipynb) ## Installation (pip): @@ -47,11 +47,11 @@ In your terminal just type ```pip install pyoptimus``` ## Examples -You can go to the 10 minutes to Optimus [notebook](https://github.com/hi-primus/optimus/blob/develop-22.6/examples/10_min_to_optimus.ipynb) where you can find the basic to start working. +You can go to the 10 minutes to Optimus [notebook](https://github.com/hi-primus/optimus/blob/develop-22.9/examples/10_min_to_optimus.ipynb) where you can find the basic to start working. -Also you can go to [Examples](https://github.com/hi-primus/optimus/tree/develop-22.6/examples/examples.md) and found specific notebooks about data cleaning, data munging, profiling, data enrichment and how to create ML and DL models. +Also you can go to [Examples](https://github.com/hi-primus/optimus/tree/develop-22.9/examples/examples.md) and found specific notebooks about data cleaning, data munging, profiling, data enrichment and how to create ML and DL models. -Besides check the [Cheat Sheet](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-22.6/docs/cheatsheet/optimus_cheat_sheet.html) +Besides check the [Cheat Sheet](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-22.9/docs/cheatsheet/optimus_cheat_sheet.html) ## Start Optimus @@ -74,7 +74,7 @@ df = op.load.csv("../examples/data/foo.csv") df = op.load.json("../examples/data/foo.json") # using a url -df = op.load.json("https://raw.githubusercontent.com/hi-primus/optimus/develop-22.6/examples/data/foo.json") +df = op.load.json("https://raw.githubusercontent.com/hi-primus/optimus/develop-22.9/examples/data/foo.json") # parquet df = op.load.parquet("../examples/data/foo.parquet") @@ -117,7 +117,7 @@ Using `display` you have a beautiful way to show your data with extra informatio ```python display(df) ``` -![](https://github.com/hi-primus/optimus/tree/develop-22.6/readme/images/table.png) +![](https://github.com/hi-primus/optimus/tree/develop-22.9/readme/images/table.png) ## Cleaning and Processing @@ -152,17 +152,17 @@ Also if you want to a suggestion or feature request use https://github.com/hi-pr ## Troubleshooting -If you have issues, see our [Troubleshooting Guide](https://github.com/hi-primus/optimus/tree/develop-22.6/troubleshooting.md) +If you have issues, see our [Troubleshooting Guide](https://github.com/hi-primus/optimus/tree/develop-22.9/troubleshooting.md) # Contributing to Optimus 💡 Contributions go far beyond pull requests and commits. We are very happy to receive any kind of contributions including: -* [Documentation](https://github.com/hi-primus/optimus/tree/develop-22.6/docs/source) updates, enhancements, designs, or bugfixes. +* [Documentation](https://github.com/hi-primus/optimus/tree/develop-22.9/docs/source) updates, enhancements, designs, or bugfixes. * Spelling or grammar fixes. * README.md corrections or redesigns. -* Adding unit, or functional [tests](https://github.com/hi-primus/optimus/tree/develop-22.6/tests) +* Adding unit, or functional [tests](https://github.com/hi-primus/optimus/tree/develop-22.9/tests) * Triaging GitHub issues -- especially determining whether an issue still persists or is reproducible. * [Blogging, speaking about, or creating tutorials](https://hioptimus.com/category/blog/) about Optimus and its many features. * Helping others on our official chats