Merge pull request #213 from lbl-anp/release-0.2.6

Release 0.2.6

LICENSE.txt

@@ -2,7 +2,7 @@
 
 *** Copyright Notice ***
 
-Becquerel v. 0.2.5, Copyright (c) 2017, The Regents of the University of California (UC), through Lawrence Berkeley National Laboratory, and the UC Berkeley campus (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
+Becquerel v. 0.2.6, Copyright (c) 2017, The Regents of the University of California (UC), through Lawrence Berkeley National Laboratory, and the UC Berkeley campus (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
 If you have questions about your rights to use or distribute this software, please contact Berkeley Lab's Innovation & Partnerships Office at  [email protected].
 
 NOTICE.  This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights.  As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit other to do so.

README.md

@@ -56,7 +56,7 @@ contributors to use [`pylint`][3], [`pycodestyle`][4], [`pydocstyle`][5] and
 
 ## Copyright Notice
 
-Becquerel v. 0.2.5, Copyright (c) 2017, The Regents of the University of
+Becquerel v. 0.2.6, Copyright (c) 2017, The Regents of the University of
 California (UC), through Lawrence Berkeley National Laboratory, and the UC
 Berkeley campus (subject to receipt of any required approvals from the U.S.
 Dept. of Energy). All rights reserved. If you have questions about your rights

becquerel/tools/nndc.py

@@ -433,6 +433,7 @@ def _request(self):
                 raise NNDCRequestError('Request failed: ' + resp.reason)
             for msg in [
                     'Your search was unsuccessful',
+                    'Your search exceeded the maximum number of results',
                     'There are too many results for your search',
             ]:
                 if msg in resp.text:
@@ -699,6 +700,9 @@ def update(self, **kwargs):
                 raise NNDCInputError(
                     'Decay mode must be one of {}, not {}'.format(
                         WALLET_DECAY_MODE.keys(), kwargs['decay'].lower()))
+            warnings.warn('query kwarg "decay" may not be working on NNDC, ' +
+                          'and the user is advised to check the ' +
+                          '"Decay Mode" column of the resulting DataFrame')
             self._data['dmed'] = 'enabled'
             self._data['dmn'] = WALLET_DECAY_MODE[kwargs['decay'].lower()]
         # handle energy level condition

setup.py

@@ -8,7 +8,7 @@
 
 MAJOR = 0
 MINOR = 2
-MICRO = 5
+MICRO = 6
 VERSION = '{}.{}.{}'.format(MAJOR, MINOR, MICRO)
 
 DESCRIPTION = __doc__.split('\n')[0].split(': ')[-1]

tests/nndc_test.py

@@ -637,6 +637,10 @@ def test_wallet_j_10(self):
             d = self.fetch(j='10')
             assert len(d) > 0
 
+    @pytest.mark.skip(reason='query kwarg "decay" seems to not be working ' +
+                             'on NNDC, and as a result too many results ' +
+                             'are returned for this test, causing an ' +
+                             'NNDCRequestError')
     def test_wallet_decay_SF(self):
         """Test fetch_wallet_card: decay='SF'.............................."""
         kwargs = [kw for kw, val in nndc.WALLET_DECAY_MODE.items()