From 6a202a4025ed67a7b9cee0c442110ad67a6b91ba Mon Sep 17 00:00:00 2001 From: Matias Carrasco Kind Date: Tue, 23 May 2017 21:42:24 -0500 Subject: [PATCH] version 1.4.2 --- CHANGES.md | 32 ++++++++++++++++---------------- README.md | 11 ++++++++--- config/conda/meta.yaml | 7 ++----- easyaccess/config_ea.py | 5 ++++- easyaccess/version.py | 2 +- tests/test_connection.py | 2 +- 6 files changed, 32 insertions(+), 27 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0cd8aed..59bdc43 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,10 @@ # Changes -## v1.4.1 +## v1.4.2 #### 2017-MAY-23 +- Fix a minor migration bug from version 1.4.1 - Add option to reset password after expiration (see #125) -- Add suppport for new databases (see #126) +- Add support for new databases (see #126) - Update tutorial link - Fix minor bugs and update commands (see #119 #120) - Fix bugs regarding cx_Oracle (see #117) @@ -21,7 +22,7 @@ - Added `change_db` option switch between dabatases without logging out (see PR #90 , #86) - Fixes authentication and des service files - Added api to access descut services directly (see PR #87) -- Fix readline issues related with some OS X (see #88 and #112) +- Fix readline issues related with some OS X (see #88 and #112) ## v1.3.1 @@ -75,11 +76,11 @@ #### 2015-APR-28 - **Change pyfits to fitsio** - Added autocommit as configuration option to commit changes or not by default (default = yes) -- Added timeout (1 min) to initial metadata cache loading +- Added timeout (1 min) to initial metadata cache loading ## v1.0.8 -#### 2015-APR-27 -- Fixed bug with single character for fits +#### 2015-APR-27 +- Fixed bug with single character for fits - Fix enconding issues (between ASCII and UTF-8) - Loading bar termination issue fixed - Added message after loading table for sharing tables @@ -88,14 +89,14 @@ - Add python API features for key commands and bugfix (All commnands can still be accessed from python API) ## v1.0.7 -#### 2015-MAR-31 +#### 2015-MAR-31 - Null and NaN values fixed and customizable (config nullvalue set -9999) It will print 'Null' on the screen but nullvalue on the files - Added a SQL syntax checker ( ; < check) -- Reformatted help +- Reformatted help ## v1.0.6 -#### 2015-MAR-25 -- Background with Ctrl-Z, bg and fg +#### 2015-MAR-25 +- Background with Ctrl-Z, bg and fg - optional loading bar from config.ini file (default = yes) - Connections trials added and error information when not connected - print version at startup @@ -104,18 +105,18 @@ - Fix issue with describe_table in latest DB schemas ## v1.0.5 -#### 2015-MAR-20 +#### 2015-MAR-20 - version 1.0.4 was skipped to be in sync with pip - Added optional color in config file (default = yes) - Added quiet option for initialization (easyaccess -q) - command to open an online tutorial (online_tutorial) ## v1.0.3 -#### 2015-MAR-18 +#### 2015-MAR-18 - Fix an installation bug ## v1.0.2 -#### 2015-MAR-18 +#### 2015-MAR-18 - Added DES Logo - Loading bar - Check whether des service file is read/write only by user, otherwise it change access mode @@ -125,12 +126,11 @@ ## v1.0.1 -#### 2015-FEB-20 -- Fix a bug at exit after error +#### 2015-FEB-20 +- Fix a bug at exit after error - Added a checker of DES_SERVICES files and prompt user/password when file doesn't exist - Minor bugs ## v1.0.0 #### 2015-FEB-17 - release - diff --git a/README.md b/README.md index 3471990..b0f7e2d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# easyaccess latest release License pypi version +# easyaccess latest release License pypi version ![help_screen](data/help.gif) Enhanced command line SQL interpreter client for astronomical databases. @@ -10,7 +10,7 @@ For a short tutorial check [here](http://matias-ck.com/easyaccess) (Using des credentials) -**Current version = 1.4.1** +**Current version = 1.4.2** ## Requirements @@ -49,7 +49,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.1 -c mgckind + conda install easyaccess==1.4.2 -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.2 ## Interactive interpreter diff --git a/config/conda/meta.yaml b/config/conda/meta.yaml index f2448c2..935ec05 100644 --- a/config/conda/meta.yaml +++ b/config/conda/meta.yaml @@ -1,12 +1,9 @@ package: name: easyaccess - version: "1.4.0" + version: "1.4.2" source: - #fn: easyaccess-1.3.1.tar.gz - #md5: 52eab3638697249f7cfda79fdd665bab - #url: https://pypi.python.org/packages/c3/47/39a31eb7e3c1cc5b34a7cbd42ad6f881a810fd9e0598319404222a137599/easyaccess-1.3.1.tar.gz - git_rev: 1.4.0 + git_rev: 1.4.2 git_url: https://github.com/mgckind/easyaccess.git build: diff --git a/easyaccess/config_ea.py b/easyaccess/config_ea.py index 56c3ea8..d9550de 100644 --- a/easyaccess/config_ea.py +++ b/easyaccess/config_ea.py @@ -295,7 +295,10 @@ def get_desconfig(desfile, db, verbose=True, user=None, pw1=None): config.set(db, 'passwd', pw1) if not config.has_option(db, 'name'): configwrite = True - config.set(db, 'name', db[3:]) + if db_alter == 'db-oldsci': + config.set(db, 'name', 'dessci') + else: + config.set(db, 'name', 'desoper') if not config.has_option(db, 'server'): configwrite = True config.set(db, 'server', server_n) diff --git a/easyaccess/version.py b/easyaccess/version.py index 990fa00..64869de 100644 --- a/easyaccess/version.py +++ b/easyaccess/version.py @@ -24,7 +24,7 @@ def last_pip_version(): return sorted(uploads, key=lambda x: x[1])[-1][0] -version_tag = (1, 4, 1) +version_tag = (1, 4, 2) __version__ = '.'.join(map(str, version_tag[:3])) if len(version_tag) > 3: diff --git a/tests/test_connection.py b/tests/test_connection.py index 12b098f..799b5bb 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -17,7 +17,7 @@ def test_connect_destest(self): self.assertTrue(con.ping()) def test_connect_newsci(self): - con = ea.connect('newsci', quiet=True) + con = ea.connect('oldsci', quiet=True) self.assertTrue(con.ping()) # @unittest.skip("Not implemented yet")