Merge pull request #80 from mgckind/1.3.1

version 1.3.1

Author: mgckind

CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+
+## v1.3.1
+#### 2016-MAY-24
+- Adds optional purge to drop_table (see PR #74)
+- Fix a bug setting prefetch parameters using config set #76
+- Improve import functionality for inline queries (see PR #78)
+- Add option to upload files in chunk of memory (in addition to the chunk by rows), using --memsize option.
+  This calculates an approximate number of rows to upload on each trip, avoiding memory issues. (see PR #79)
+
 ## v1.3.0
 #### 2016-MAY-09
 - Fixes a bug with python2/3 compatibility (see Pull-request #36)

README.md

@@ -1,4 +1,4 @@
-# easyaccess <a href="https://github.com/mgckind/easyaccess/releases/tag/1.3.0"> <img src="https://img.shields.io/badge/release-v1.3.0-blue.svg" alt="latest release" /></a> <a href="https://github.com/mgckind/easyaccess/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-NCSA%20License-blue.svg" alt="License" /> </a> <a href="https://pypi.python.org/pypi/easyaccess/1.3.0"><img src="https://img.shields.io/badge/pypi-v1.3.0-orange.svg" alt="pypi version"/></a>
+# easyaccess <a href="https://github.com/mgckind/easyaccess/releases/tag/1.3.1"> <img src="https://img.shields.io/badge/release-v1.3.1-blue.svg" alt="latest release" /></a> <a href="https://github.com/mgckind/easyaccess/blob/master/LICENSE.txt"><img src="https://img.shields.io/badge/license-NCSA%20License-blue.svg" alt="License" /> </a> <a href="https://pypi.python.org/pypi/easyaccess/1.3.1"><img src="https://img.shields.io/badge/pypi-v1.3.1-orange.svg" alt="pypi version"/></a>
 ![help_screen](data/help_screenshot.png)
 
 Enhanced command line SQL interpreter client for astronomical databases.
@@ -10,7 +10,7 @@ For a short tutorial (To be completed) check [here](http://deslogin.cosmology.il
 (Using des credentials)
 
 
-**Current version = 1.3.0**
+**Current version = 1.3.1**
 
 ## Requirements
 
@@ -29,7 +29,7 @@ For a short tutorial (To be completed) check [here](http://deslogin.cosmology.il
 - Very flexible configuration
 - Smart tab completion for commands, table names, column names and file paths accordingly
 - write output results to csv, tab, fits files or HDF5 files
-- load tables from csv, fits or hdf5 directly into DB (memory friendly)
+- load tables from csv, fits or hdf5 directly into DB (memory friendly by using number of rows or memory limit)
 - intrinsic db commands to describe tables, own schema, quota and more
 - It can be imported as module from python, extense python API
 - Can run command directly from command line
@@ -64,7 +64,9 @@ The file types supported so far are: .csv, .tab, .fits, and .h5. Any other exten
 To load a table it needs to be in a csv format with columns names in the first row
 the name of the table is taken from filename or with optional argument --tablename
 
-        DESDB ~> load_table <filename> --tablename <mytable>
+        DESDB ~> load_table <filename> --tablename <mytable> --chunksize <number of rows to read/upload> --memsize <memory in MB to read at a time>
+
+The --chunsize and --memsize are optional arguments to facilitate uploading big files.
 
 ### Load SQL queries
 To load SQL queries just run:

easyaccess/version.py

@@ -17,7 +17,7 @@
 #    versions.sort()
 #    return versions[-1]
 
-version_tag = (1, 3, 0)
+version_tag = (1, 3, 1)
 __version__ = '.'.join(map(str, version_tag[:3]))
 
 if len(version_tag) > 3:

setup.py

@@ -20,9 +20,9 @@ def read(filename):
     author='Matias Carrasco Kind',
     author_email='[email protected]',
     scripts=['bin/easyaccess'],
-    py_modules=['easyaccess','easyaccess.eautils', 'easyaccess.version','easyaccess.config_ea'],
+    py_modules=['easyaccess','easyaccess.eautils', 'easyaccess.version','easyaccess.config_ea', 'tests'],
     #packages=find_packages(),
-    packages=['easyaccess','easyaccess.eautils'],
+    packages=['easyaccess','easyaccess.eautils','tests'],
     license='LICENSE.txt',
     description='Easy access to the DES DB. Enhanced command line SQL interpreter client for DESDM',
     long_description=read('README.md'),