Skip to content

Commit

Permalink
Merge pull request #1012 from ironmussa/develop
Browse files Browse the repository at this point in the history
Fix #1011
  • Loading branch information
argenisleon authored Jul 19, 2020
2 parents 6e4950d + 5ff37dc commit 7f015ea
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 8 deletions.
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,21 @@ examples/data/star0000-1.csv
examples/yellow_tripdata_2009-01.csv

examples/yellow_tripdata_2009-02.csv

tests/creator/dask-worker-space/

examples/data/AllData.xlsx

examples/data/jurgen.csv

examples/data/linkedin.csv

examples/data/netflix_titles.csv

examples/data/personal_finance769k.csv

examples/data/taa.csv

examples/data/titanic3-1.xlsx

examples/mydask.png
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
# The short X.Y version.
version = '2.2'
# The full version, including alpha/beta/rc tags.
release = "2.2.31"
release = "2.2.32"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion optimus/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ def _safe_int(string):
return string


__version__ = '2.2.31'
__version__ = '2.2.32'
VERSION = tuple(_safe_int(x) for x in __version__.split('.'))
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
simplejson==3.16.0
cryptography==2.7
imgkit==1.0.1
packaging==19.1
packaging==19.0
requests==2.20.0
tqdm==4.28.1
pymongo==3.9.0
Expand All @@ -23,9 +23,9 @@ flask==1.0.2
ipython==7.5.0
ratelimit==2.2.1
humanize==0.5.1
h2o-pysparkling-2.4==2.4.13
psutil==5.6.3
backoff==1.8.0
h2o-pysparkling-2.4==2.4.10
psutil==5.7.2
backoff==1.10.0
pymongo==3.9.0
kombu==4.6.1
pandas==0.24.2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def readme():
author='Favio Vazquez and Argenis Leon',
author_email='argenisleon@gmail.com',
url='https://github.com/ironmussa/Optimus/',
download_url='https://github.com/ironmussa/Optimus/archive/2.2.31.tar.gz',
download_url='https://github.com/ironmussa/Optimus/archive/2.2.32.tar.gz',
description=('Optimus is the missing framework for cleaning and pre-processing data in a distributed fashion with '
'pyspark.'),
long_description=readme(),
Expand Down
2 changes: 1 addition & 1 deletion tests/test_df_cols.py

Large diffs are not rendered by default.

0 comments on commit 7f015ea

Please sign in to comment.