Merge pull request #156 from mgckind/1.4.5

1.4.5

CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## v1.4.5
+#### 2018-OCT-04
+- Restructuring code structure (PR #151)
+- Add paper reference
+- Minor fixes in unitests
+- Update documentation 
+- Fix conda issues
 
 ## v1.4.4
 #### 2018-JUN-15

README.md

@@ -1,4 +1,4 @@
-# easyaccess <a href="https://github.com/mgckind/easyaccess/releases/tag/1.4.4"> <img src="https://img.shields.io/badge/release-v1.4.4-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.4.4"><img src="https://img.shields.io/badge/pypi-v1.4.4-orange.svg" alt="pypi version"/></a><a href="https://anaconda.org/mgckind/easyaccess"> <img src="https://img.shields.io/badge/Anaconda Cloud-v1.4.4-blue.svg" /> </a>
+# easyaccess <a href="https://github.com/mgckind/easyaccess/releases/tag/1.4.5"> <img src="https://img.shields.io/badge/release-v1.4.5-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.4.5"><img src="https://img.shields.io/badge/pypi-v1.4.5-orange.svg" alt="pypi version"/></a><a href="https://anaconda.org/mgckind/easyaccess"> <img src="https://img.shields.io/badge/Anaconda Cloud-v1.4.5-blue.svg" /> </a>
 ![help_screen](data/help.gif)
 
 Enhanced command line SQL interpreter client for astronomical databases.
@@ -8,7 +8,13 @@ using cx_Oracle
 
 For a short tutorial check [here](http://matias-ck.com/easyaccess)
 
-**Current version = 1.4.4**
+**Current version = 1.4.5**
+
+For DES public data release, you can start `easyaccess` with:
+
+    easyaccess -s desdr
+
+To create an account click [here](https://des.ncsa.illinois.edu/easyweb/signup/).
 
 ## Requirements
 
@@ -45,12 +51,12 @@ For a short tutorial check [here](http://matias-ck.com/easyaccess)
 ## Conda installation
 Now easyaccess can be installed using [conda](http://conda.pydata.org/docs/install/quick.html) out of the box!
 
-    conda install easyaccess==1.4.3 -c mgckind
+    conda install easyaccess==1.4.5 -c mgckind
 
 ## Pip installation
 easyaccess can also be installed using `pip` but it'd require the installation of the oracle instant client first
 
-    pip install easyaccess==1.4.3
+    pip install easyaccess==1.4.5
 
 ## Interactive interpreter
 

config/conda/meta.yaml

@@ -1,9 +1,9 @@
 package:
   name: easyaccess
-  version: "1.4.4"
+  version: "1.4.5"
 
 source:
-  git_rev: 1.4.4
+  git_rev: 1.4.5
   git_url: https://github.com/mgckind/easyaccess.git
 
 build:
@@ -22,10 +22,9 @@ requirements:
     - requests
     - termcolor >=1.1.0
     - fitsio >=0.9.11
-    - pandas >=0.14
     - oracle-instantclient ==11.2.0.4.0
     - cx_oracle ==5.3
-    - numpy
+    - numpy >=1.13.0
     - python-dateutil
 
   run:
@@ -34,10 +33,9 @@ requirements:
     - requests
     - termcolor >=1.1.0
     - fitsio >=0.9.11
-    - pandas >=0.14
     - oracle-instantclient ==11.2.0.4.0
     - cx_oracle ==5.3
-    - numpy
+    - numpy >=1.13.0
     - python-dateutil
 
 test:

easyaccess/__init__.py

@@ -1,6 +1,7 @@
 from .easyaccess import *
 from .version import __version__
 from .eautils import db_api as api
+from .eautils.python_api import *
 
 version = __version__
 __all__ = ["eautils", "config_ea", "easyaccess", "version", "eaparser"]

easyaccess/config_ea.py

@@ -162,8 +162,8 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None):
     """
     Loads des config file or create one if it does not exist.
     """
-    server_2 = 'desdb.ncsa.illinois.edu'
-    server_3 = 'desdb-dr.ncsa.illinois.edu'
+    server_desdm = 'desdb.ncsa.illinois.edu'
+    server_public = 'desdb-dr.ncsa.illinois.edu'
     port_n = '1521'
 
     if not db[:3] == 'db-':
@@ -195,15 +195,15 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None):
             print('\nAdding section %s to des_service file\n' % db)
         configwrite = True
         if db == 'db-dessci':
-            kwargs = {'host': server_2, 'port': port_n, 'service_name': 'dessci'}
+            kwargs = {'host': server_desdm, 'port': port_n, 'service_name': 'dessci'}
         elif db == 'db-desdr':
-            kwargs = {'host': server_3, 'port': port_n, 'service_name': 'desdr'}
+            kwargs = {'host': server_public, 'port': port_n, 'service_name': 'desdr'}
         elif db == 'db-destest':
-            kwargs = {'host': server_2, 'port': port_n, 'service_name': 'destest'}
+            kwargs = {'host': server_desdm, 'port': port_n, 'service_name': 'destest'}
         elif db == 'db-desoper':
-            kwargs = {'host': server_2, 'port': port_n, 'service_name': 'desoper'}
+            kwargs = {'host': server_desdm, 'port': port_n, 'service_name': 'desoper'}
         else:
-            kwargs = {'host': server_2, 'port': port_n, 'service_name': db[3:]}
+            kwargs = {'host': server_desdm, 'port': port_n, 'service_name': db[3:]}
         dsn = cx_Oracle.makedsn(**kwargs)
         good = False
         if user is None:
@@ -264,28 +264,28 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None):
             config.set(db, 'name', 'dessci')
             if not config.has_option(db, 'server'):
                 configwrite = True
-                config.set(db, 'server', server_2)
+                config.set(db, 'server', server_desdm)
     elif db == 'db-desoper':
         if not config.has_option(db, 'name'):
             configwrite = True
             config.set(db, 'name', 'desoper')
             if not config.has_option(db, 'server'):
                 configwrite = True
-                config.set(db, 'server', server_2)
+                config.set(db, 'server', server_desdm)
     elif db == 'db-desdr':
         if not config.has_option(db, 'name'):
             configwrite = True
             config.set(db, 'name', 'desdr')
             if not config.has_option(db, 'server'):
                 configwrite = True
-                config.set(db, 'server', server_3)
+                config.set(db, 'server', server_public)
     else:
         if not config.has_option(db, 'name'):
             configwrite = True
             config.set(db, 'name', db[3:])
             if not config.has_option(db, 'server'):
                 configwrite = True
-                config.set(db, 'server', server_2)
+                config.set(db, 'server', server_desdm)
     if not config.has_option(db, 'port'):
         configwrite = True
         config.set(db, 'port', port_n)