Skip to content

Commit 38838ae

Browse files
shyuepshyuep
committed
Update tov0.4.5 and fix bad get_database with empty password.
1 parent 1e83735 commit 38838ae

13 files changed

+46
-45
lines changed

‎docs/_build/html/.buildinfo

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: 7659be8b4fff62e8291adaffa9122ea4
3+
config: 9c4830439d15bfc5efc4d90642e124de
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/_build/html/_modules/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>Overview: module code &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>Overview: module code &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../index.html" />
2828

2929
<script type="text/javascript">
3030
var _gaq = _gaq || [];
@@ -43,7 +43,7 @@ <h3>Navigation</h3>
4343
<li class="right" >
4444
<a href="../py-modindex.html" title="Python Module Index"
4545
>modules</a> |</li>
46-
<li><a href="../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
46+
<li><a href="../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4747
</ul>
4848
</div>
4949

@@ -105,7 +105,7 @@ <h3>Navigation</h3>
105105
<li class="right" >
106106
<a href="../py-modindex.html" title="Python Module Index"
107107
>modules</a> |</li>
108-
<li><a href="../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
108+
<li><a href="../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
109109
</ul>
110110
</div>
111111

‎docs/_build/html/_modules/matgendb/alchemy/transmuters.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.alchemy.transmuters &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.alchemy.transmuters &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../../index.html" />
2828
<link rel="up" title="Module code" href="../../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -156,7 +156,7 @@ <h3>Navigation</h3>
156156
<li class="right" >
157157
<a href="../../../py-modindex.html" title="Python Module Index"
158158
>modules</a> |</li>
159-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
159+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
160160
<li><a href="../../index.html" >Module code</a> &raquo;</li>
161161
</ul>
162162
</div>

‎docs/_build/html/_modules/matgendb/creator.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.creator &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.creator &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../index.html" />
2828
<link rel="up" title="Module code" href="../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -825,7 +825,7 @@ <h3>Navigation</h3>
825825
<li class="right" >
826826
<a href="../../py-modindex.html" title="Python Module Index"
827827
>modules</a> |</li>
828-
<li><a href="../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
828+
<li><a href="../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
829829
<li><a href="../index.html" >Module code</a> &raquo;</li>
830830
</ul>
831831
</div>

‎docs/_build/html/_modules/matgendb/query_engine.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.query_engine &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.query_engine &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../index.html" />
2828
<link rel="up" title="Module code" href="../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -658,7 +658,7 @@ <h3>Navigation</h3>
658658
<li class="right" >
659659
<a href="../../py-modindex.html" title="Python Module Index"
660660
>modules</a> |</li>
661-
<li><a href="../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
661+
<li><a href="../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
662662
<li><a href="../index.html" >Module code</a> &raquo;</li>
663663
</ul>
664664
</div>

‎docs/_build/html/_modules/matgendb/util.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.util &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.util &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../index.html" />
2828
<link rel="up" title="Module code" href="../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -114,7 +114,7 @@ <h1>Source code for matgendb.util</h1><div class="highlight"><pre>
114114
<span class="n">user</span> <span class="o">=</span> <span class="n">d</span><span class="p">[</span><span class="s">&quot;admin_user&quot;</span><span class="p">]</span> <span class="k">if</span> <span class="n">admin</span> <span class="k">else</span> <span class="n">d</span><span class="p">[</span><span class="s">&quot;readonly_user&quot;</span><span class="p">]</span>
115115
<span class="n">passwd</span> <span class="o">=</span> <span class="n">d</span><span class="p">[</span><span class="s">&quot;admin_password&quot;</span><span class="p">]</span> <span class="k">if</span> <span class="n">admin</span> <span class="k">else</span> <span class="n">d</span><span class="p">[</span><span class="s">&quot;readonly_password&quot;</span><span class="p">]</span>
116116
<span class="n">db</span><span class="o">.</span><span class="n">authenticate</span><span class="p">(</span><span class="n">user</span><span class="p">,</span> <span class="n">passwd</span><span class="p">)</span>
117-
<span class="k">except</span> <span class="p">(</span><span class="ne">KeyError</span><span class="p">,</span> <span class="ne">TypeError</span><span class="p">):</span>
117+
<span class="k">except</span> <span class="p">(</span><span class="ne">KeyError</span><span class="p">,</span> <span class="ne">TypeError</span><span class="p">,</span> <span class="ne">ValueError</span><span class="p">):</span>
118118
<span class="n">_log</span><span class="o">.</span><span class="n">warn</span><span class="p">(</span><span class="s">&quot;No {admin,readonly}_user/password found in config. file, &quot;</span>
119119
<span class="s">&quot;accessing DB without authentication&quot;</span><span class="p">)</span>
120120
<span class="k">return</span> <span class="n">db</span>
@@ -196,7 +196,7 @@ <h3>Navigation</h3>
196196
<li class="right" >
197197
<a href="../../py-modindex.html" title="Python Module Index"
198198
>modules</a> |</li>
199-
<li><a href="../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
199+
<li><a href="../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
200200
<li><a href="../index.html" >Module code</a> &raquo;</li>
201201
</ul>
202202
</div>

‎docs/_build/html/_modules/matgendb/vv/report.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.vv.report &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.vv.report &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../../index.html" />
2828
<link rel="up" title="Module code" href="../../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -810,7 +810,7 @@ <h3>Navigation</h3>
810810
<li class="right" >
811811
<a href="../../../py-modindex.html" title="Python Module Index"
812812
>modules</a> |</li>
813-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
813+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
814814
<li><a href="../../index.html" >Module code</a> &raquo;</li>
815815
</ul>
816816
</div>

‎docs/_build/html/_modules/matgendb/vv/util.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.vv.util &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.vv.util &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../../index.html" />
2828
<link rel="up" title="Module code" href="../../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -337,7 +337,7 @@ <h3>Navigation</h3>
337337
<li class="right" >
338338
<a href="../../../py-modindex.html" title="Python Module Index"
339339
>modules</a> |</li>
340-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
340+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
341341
<li><a href="../../index.html" >Module code</a> &raquo;</li>
342342
</ul>
343343
</div>

‎docs/_build/html/_modules/matgendb/vv/validate.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
88

9-
<title>matgendb.vv.validate &mdash; pymatgen-db 0.4.4 documentation</title>
9+
<title>matgendb.vv.validate &mdash; pymatgen-db 0.4.5 documentation</title>
1010

1111
<link rel="stylesheet" href="../../../_static/proBlue.css" type="text/css" />
1212
<link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
1313

1414
<script type="text/javascript">
1515
var DOCUMENTATION_OPTIONS = {
1616
URL_ROOT: '../../../',
17-
VERSION: '0.4.4',
17+
VERSION: '0.4.5',
1818
COLLAPSE_INDEX: false,
1919
FILE_SUFFIX: '.html',
2020
HAS_SOURCE: true
@@ -24,7 +24,7 @@
2424
<script type="text/javascript" src="../../../_static/underscore.js"></script>
2525
<script type="text/javascript" src="../../../_static/doctools.js"></script>
2626
<link rel="shortcut icon" href="../../../_static/favicon.ico"/>
27-
<link rel="top" title="pymatgen-db 0.4.4 documentation" href="../../../index.html" />
27+
<link rel="top" title="pymatgen-db 0.4.5 documentation" href="../../../index.html" />
2828
<link rel="up" title="Module code" href="../../index.html" />
2929

3030
<script type="text/javascript">
@@ -44,7 +44,7 @@ <h3>Navigation</h3>
4444
<li class="right" >
4545
<a href="../../../py-modindex.html" title="Python Module Index"
4646
>modules</a> |</li>
47-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
47+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
4848
<li><a href="../../index.html" accesskey="U">Module code</a> &raquo;</li>
4949
</ul>
5050
</div>
@@ -722,7 +722,7 @@ <h3>Navigation</h3>
722722
<li class="right" >
723723
<a href="../../../py-modindex.html" title="Python Module Index"
724724
>modules</a> |</li>
725-
<li><a href="../../../index.html">pymatgen-db 0.4.4 documentation</a> &raquo;</li>
725+
<li><a href="../../../index.html">pymatgen-db 0.4.5 documentation</a> &raquo;</li>
726726
<li><a href="../../index.html" >Module code</a> &raquo;</li>
727727
</ul>
728728
</div>

‎matgendb/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
__author__ = "Shyue Ping Ong, Dan Gunter"
1111
__date__ = "Feb 12 2014"
12-
__version__ = "0.4.4"
12+
__version__ = "0.4.5"
1313

1414

1515
from .query_engine import QueryEngine

‎matgendb/util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def get_database(config_file=None, settings=None, admin=False):
5757
user = d["admin_user"] if admin else d["readonly_user"]
5858
passwd = d["admin_password"] if admin else d["readonly_password"]
5959
db.authenticate(user, passwd)
60-
except (KeyError, TypeError):
60+
except (KeyError, TypeError, ValueError):
6161
_log.warn("No {admin,readonly}_user/password found in config. file, "
6262
"accessing DB without authentication")
6363
return db

0 commit comments

Comments
 (0)