Skip to content

Commit

Permalink
Merge pull request #71 from mgckind/1.3.0
Browse files Browse the repository at this point in the history
1.3.0
  • Loading branch information
mgckind committed May 9, 2016
2 parents 78ee80a + 03f8e77 commit 7f6e795
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 30 deletions.
14 changes: 7 additions & 7 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# Changes

## v1.3.0
#### 2016-XXX-XX
#### 2016-MAY-09
- Fixes a bug with python2/3 compatibility (see Pull-request #36)
- Removes ; from query for python API (query_* functions) issue #37
- Added execproc to run sql/pl procedures, see help execproc for more information (see PR #48)
- Fix show_index and describe_table commands and queries (no more repeated rows) (see PR #42 and #43)
- Case insensitive options (PR #45)
- Reorganization of the structure of the code, this way is much simpler to develop (PR #49)
- Conda installation
- In-query python functions (beta)
- In-query python functions (beta) write your own function and call it from query#67
- Query and execution information in FITS header #50
- Fix bug when loading sql from file #55
- Dealing better with trailing white space #52
- Fix several minor issues: #37, #40
- configuration options at command line
- Improved python API
- Load big files
- Fix find_tables (to include owners) and describe_table (dat_type) commands
- Added unittest suites
- configuration options at command line (reset and configuration per session) with --config
- Improved python API , added some extra functions (pandas_to_db) and imprived docs#68
- Load big files in chunks -- very useful to load big files in chunks without running into memory issues #66
- Fix find_tables (to include owners) and describe_table (data_type) commands
- Added unittest suites #65 #70
- Added --no_refresh option in command line to quick start up


Expand Down
25 changes: 12 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# easyaccess <a href="https://github.com/mgckind/easyaccess/releases/tag/1.2.0"> <img src="https://img.shields.io/badge/release-v1.2.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.2.0"><img src="https://img.shields.io/badge/pypi-v1.2.0-orange.svg" alt="pypi version"/></a>
# 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>
![help_screen](data/help_screenshot.png)

Refactored version of trivialAccess for accessing the DES DB
Enhanced command line SQL interpreter client for astronomical databases.

Python Command Line Interpreter to access Oracle DES DB
using cx_Oracle
Expand All @@ -10,7 +10,7 @@ For a short tutorial (To be completed) check [here](http://deslogin.cosmology.il
(Using des credentials)


**Current version = 1.2.0**
**Current version = 1.3.0**

## Requirements

Expand All @@ -25,19 +25,23 @@ For a short tutorial (To be completed) check [here](http://deslogin.cosmology.il
- **Note that you need to install python-future for python2/3 compatibility**

## Some *nice* features
- Nice output format
- Nice output format (using pandas)
- 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 or fits directly into DB
- load tables from csv, fits or hdf5 directly into DB (memory friendly)
- intrinsic db commands to describe tables, own schema, quota and more
- It can be imported as module
- It can be imported as module from python, extense python API
- Can run command directly from command line
- Load sql query from file and/or from editor
- Show the execution plan of a query if required
- Can run python functions inline query
- Many more

## Conda installation
Now easyaccess can be installed using [conda](http://conda.pydata.org/docs/install/quick.html) out of the box!

conda install easyaccess -c mgckind

## Interactive interpreter

Expand All @@ -58,9 +62,9 @@ The file types supported so far are: .csv, .tab, .fits, and .h5. Any other exten

### Load tables
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
the name of the table is taken from filename or with optional argument --tablename

DESDB ~> load_table <filename>
DESDB ~> load_table <filename> --tablename <mytable>

### Load SQL queries
To load SQL queries just run:
Expand Down Expand Up @@ -96,8 +100,3 @@ Much of the functionality provided through the interpreter is also available dir

easyaccess --help

## TODO
- There is a bug with some versions of readline
- Other small changes when loading tables
- Self-upgrade
- Refactor the code so that it isn't in one huge file
14 changes: 6 additions & 8 deletions config/conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package:
name: easyaccess
version: "1.3.0rc"
version: "1.3.0"

source:
fn: easyaccess-1.3.0-rc2.tar.gz
md5: dbc19f823613ef1fbc35f6cc17ca0262
url: https://pypi.python.org/packages/4c/4b/65e0d4b95ed47295d8593c6b6c19d4e7a99eba3f4ae7857ea8f56d101b9c/easyaccess-1.3.0-rc2.tar.gz
#git_rev: '1.2.1b'
#git_url: https://github.com/mgckind/easyaccess
fn: easyaccess-1.3.0.tar.gz
md5: f3160dcc95de2a0fe7c29a08c4aa14dd
url: https://pypi.python.org/packages/22/a9/28586f7623f15ebbfea8c983300b9e3fd7201bf07ca0463a787a2f6329b3/easyaccess-1.3.0.tar.gz


build:
number: 2
number: 0


requirements:
Expand All @@ -23,7 +21,7 @@ requirements:
- python
- future
- termcolor
- fitsio
- fitsio >=0.9.8
- pandas >=0.14
- oracle-instantclient
- cx_oracle
Expand Down
2 changes: 1 addition & 1 deletion easyaccess/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# versions.sort()
# return versions[-1]

version_tag = (1, 3, 0, 'rc3')
version_tag = (1, 3, 0)
__version__ = '.'.join(map(str, version_tag[:3]))

if len(version_tag) > 3:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def read(filename):
#packages=find_packages(),
packages=['easyaccess','easyaccess.eautils'],
license='LICENSE.txt',
description='Easy access to the DES DB. Enhance command line SQL interpreter client for DESDM',
description='Easy access to the DES DB. Enhanced command line SQL interpreter client for DESDM',
long_description=read('README.md'),
url='https://github.com/mgckind/easyaccess',
install_requires=['pandas >= 0.14','termcolor','fitsio >= 0.9.6','cx_Oracle','future >= 0.15.0'],
Expand Down

0 comments on commit 7f6e795

Please sign in to comment.