diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-01 12:13:25 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-01 12:13:25 +0000 |
commit | 57206da2279a68584765c2e35ecf618261d6aa49 (patch) | |
tree | e9a172a003224dc8118c4c2f88fe75d3b7e1d96b | |
parent | 90c74c8c50ada3796c2c430cb78c07bab3d4ec3c (diff) | |
parent | a10e42826566280fdc42e95343e71674afd353fb (diff) | |
download | pint-57206da2279a68584765c2e35ecf618261d6aa49.tar.gz |
Merge #697
697: Update with pandas interface authors r=hgrecco a=znicholls
closes #694
@andrewgsavage can you add your email to this (you should be able to push directly to this branch)
Co-authored-by: Zebedee Nicholls <zebedee.nicholls@climate-energy-college.org>
Co-authored-by: andrewgsavage <andrewgsavage@gmail.com>
-rw-r--r-- | AUTHORS | 2 | ||||
-rw-r--r-- | pint/pandas_interface/pint_array.py | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -6,6 +6,7 @@ Other contributors, listed alphabetically, are: * Alexander Böhn <fish2000@gmail.com> * Ana Krivokapic <akrivokapic1@gmail.com> * Andrea Zonca <code@andreazonca.com> +* Andrew Savage <andrewgsavage@gmail.com> * Brend Wanders <b.wanders@utwente.nl> * choloepus * coutinho <coutinho@esrf.fr> @@ -38,5 +39,6 @@ Other contributors, listed alphabetically, are: * Thomas Kluyver <takowl@gmail.com> * Tom Ritchford <tom@swirly.com> * Virgil Dupras <virgil.dupras@savoirfairelinux.com> +* Zebedee Nicholls <zebedee.nicholls@climate-energy-college.org> (If you think that your name belongs here, please let the maintainer know) diff --git a/pint/pandas_interface/pint_array.py b/pint/pandas_interface/pint_array.py index 42ebe65..5e0cb89 100644 --- a/pint/pandas_interface/pint_array.py +++ b/pint/pandas_interface/pint_array.py @@ -3,8 +3,6 @@ pint.pandas_interface.pint_array ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - # I'm happy with both of these as long as Andrew and Zebedee are added on - # but need to check with Pint Authors... :copyright: 2018 by Pint Authors, see AUTHORS for more details. :license: BSD, see LICENSE for more details. """ |