Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
luis11011 committed May 1, 2023
1 parent 609b66b commit 22029c5
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:
branches:
- main
- develop-22.10
- develop-23.5

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .pyup.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
update: insecure
branch: develop-22.10
branch: develop-23.5
schedule: "every two weeks on monday"
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.0-beta"
RUN echo "Version 23.5.0-beta"

RUN pip install cytoolz && \
pip install llvmlite --ignore-installed && \
pip install git+https://github.com/hi-primus/optimus.git@develop-22.10#egg=pyoptimus[pandas] && \
pip install git+https://github.com/hi-primus/optimus.git@develop-22.10#egg=pyoptimus[dask]
pip install git+https://github.com/hi-primus/optimus.git@develop-23.5#egg=pyoptimus[pandas] && \
pip install git+https://github.com/hi-primus/optimus.git@develop-23.5#egg=pyoptimus[dask]

CMD jupyter notebook --port=8888 --no-browser --ip=0.0.0.0 --allow-root

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.coiled
Original file line number Diff line number Diff line change
Expand Up @@ -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.10 --no-cache-dir
pip install git+https://github.com/hi-primus/optimus.git@develop-23.5 --no-cache-dir



Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.gpu-coiled
Original file line number Diff line number Diff line change
Expand Up @@ -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.10 --no-cache-dir
pip install git+https://github.com/hi-primus/optimus.git@develop-23.5 --no-cache-dir
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Optimus

[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.10/images/optimus-logo.png)](https://hi-optimus.com)
[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/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)
Expand Down Expand Up @@ -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.10?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-22.10%2Fexamples%2F10_min_to_optimus.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hi-primus/optimus/develop-23.5?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-23.5%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):
Expand All @@ -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.10
pip install git+https://github.com/hi-primus/optimus.git@develop-23.5
```

To install other engines:
```
pip install git+https://github.com/hi-primus/optimus.git@develop-22.10#egg=pyoptimus[dask]
pip install git+https://github.com/hi-primus/optimus.git@develop-23.5#egg=pyoptimus[dask]
```


Expand All @@ -66,11 +66,11 @@ pip install git+https://github.com/hi-primus/[email protected]#egg=pyopt

## Examples

You can go to [10 minutes to Optimus](https://github.com/hi-primus/optimus/blob/develop-22.10/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-23.5/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.10/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-23.5/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.10/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-23.5/docs/cheatsheet/optimus_cheat_sheet.html) with the most common Optimus' operations.

## Start Optimus

Expand All @@ -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.10/examples/data/foo.json")
df = op.load.json("https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/examples/data/foo.json")

# parquet
df = op.load.parquet("../examples/data/foo.parquet")
Expand Down Expand Up @@ -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.10/readme/images/table.png)
![](https://github.com/hi-primus/optimus/tree/develop-23.5/readme/images/table.png)

## Cleaning and Processing

Expand Down Expand Up @@ -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.10/troubleshooting.md)
If you have issues, see our [Troubleshooting Guide](https://github.com/hi-primus/optimus/tree/develop-23.5/troubleshooting.md)

# Contributing to Optimus 💡

Expand All @@ -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.10/tests)
* Adding unit, or functional [tests](https://github.com/hi-primus/optimus/tree/develop-23.5/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
Expand Down
12 changes: 6 additions & 6 deletions README_for_devs.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.10
pip install --upgrade --no-deps --force-reinstall git+https://github.com/hi-primus/optimus.git@develop-23.5
```

### Compiling redis .jar file
Expand All @@ -125,7 +125,7 @@ Here the workflow.
```
https://github.com/hi-primus/optimus.git
cd Optimus
git checkout develop-22.10
git checkout develop-23.5
```
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
Expand All @@ -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.10
pip install --upgrade --force-reinstall git+https://github.com/hi-primus/optimus.git@develop-23.5
pip install dask[complete]
Expand Down Expand Up @@ -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.10/readme/images/inheritance.jpg)
![Inheritance](https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/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.
Expand Down Expand Up @@ -278,14 +278,14 @@ conda-build optimus -c rapidsai -c nvidia -c conda-forge -c defaults -c h2oai

Search for the message
```
anaconda upload xxxxxx\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-22.10.0-py_0.tar.bz2
anaconda upload xxxxxx\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-23.5.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.10.0-py_0.tar.bz2
anaconda upload -u optimus xxxxxx\Anaconda3\envs\optimusbuild\conda-bld\noarch\optimus-23.5.0-py_0.tar.bz2
```
use your anaconda credentials for https://anaconda.org/

Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/optimus-cudf/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "22.10.0" %}
{% set version = "23.5.0" %}

package:
name: optimus
version: {{ version }}

source:
git_url: https://github.com/hi-primus/optimus
git_rev: develop-22.10
git_rev: develop-23.5
git_depth: 1 # (Defaults to -1/not shallow)

build:
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/optimus-dask/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "22.10.0" %}
{% set version = "23.5.0" %}

package:
name: optimus
version: {{ version }}

source:
git_url: https://github.com/hi-primus/optimus
git_rev: develop-22.10
git_rev: develop-23.5
git_depth: 1 # (Defaults to -1/not shallow)

build:
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/optimus-pandas/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "22.10.0" %}
{% set version = "23.5.0" %}

package:
name: optimus
version: {{ version }}

source:
git_url: https://github.com/hi-primus/optimus
git_rev: develop-22.10
git_rev: develop-23.5
git_depth: 1 # (Defaults to -1/not shallow)

build:
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/optimus-spark/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% set version = "22.10.0" %}
{% set version = "23.5.0" %}

package:
name: optimus
version: {{ version }}

source:
git_url: https://github.com/hi-primus/optimus
git_rev: develop-22.10
git_rev: develop-23.5
git_depth: 1 # (Defaults to -1/not shallow)

build:
Expand Down
8 changes: 4 additions & 4 deletions examples/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

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.10/examples/column.html)
[HTML Preview](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-23.5/examples/column.html)

[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.10/examples/column.ipynb)
[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/examples/column.ipynb)

# Outdated examples

## Rows

Row operations (Outdated).

[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.10/examples/row.ipynb)
[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/examples/row.ipynb)

## Plots

Display plots from your dataframes (Outdated).

[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.10/examples/plot.ipynb)
[Download Python Notebook](https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/examples/plot.ipynb)
2 changes: 1 addition & 1 deletion optimus/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = '22.10.0-beta'
__version__ = '23.5.0-beta'
VERSION = tuple(int(i) if i.isdigit() else i for i in __version__.split('.'))
20 changes: 10 additions & 10 deletions readme/readme_.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jupyter:

# Optimus

[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-22.10/images/optimus-logo.png)](https://hi-optimus.com)
[![Logo Optimus](https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/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)
Expand All @@ -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.10?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-22.10%2Fexamples%2F10_min_to_optimus.ipynb)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hi-primus/optimus/develop-23.5?filepath=https%3A%2F%2Fraw.githubusercontent.com%2Fhi-primus%2Foptimus%2Fdevelop-23.5%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):
Expand All @@ -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.10/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-23.5/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.10/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-23.5/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.10/docs/cheatsheet/optimus_cheat_sheet.html)
Besides check the [Cheat Sheet](https://htmlpreview.github.io/?https://github.com/hi-primus/optimus/blob/develop-23.5/docs/cheatsheet/optimus_cheat_sheet.html)

## Start Optimus

Expand All @@ -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.10/examples/data/foo.json")
df = op.load.json("https://raw.githubusercontent.com/hi-primus/optimus/develop-23.5/examples/data/foo.json")

# parquet
df = op.load.parquet("../examples/data/foo.parquet")
Expand Down Expand Up @@ -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.10/readme/images/table.png)
![](https://github.com/hi-primus/optimus/tree/develop-23.5/readme/images/table.png)

## Cleaning and Processing

Expand Down Expand Up @@ -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.10/troubleshooting.md)
If you have issues, see our [Troubleshooting Guide](https://github.com/hi-primus/optimus/tree/develop-23.5/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.10/docs/source) updates, enhancements, designs, or bugfixes.
* [Documentation](https://github.com/hi-primus/optimus/tree/develop-23.5/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.10/tests)
* Adding unit, or functional [tests](https://github.com/hi-primus/optimus/tree/develop-23.5/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
Expand Down

0 comments on commit 22029c5

Please sign in to comment.