Skip to content

Commit

Permalink
Updated contributors in AUTHORS.txt and .mailmap
Browse files Browse the repository at this point in the history
  • Loading branch information
zbruick committed Jul 5, 2019
1 parent d60d000 commit c1527fc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
7 changes: 7 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ John Leeman <kd5wxb@gmail.com>
<sarms@ucar.edu> <sarms@unidata.ucar.edu>
Kevin Goebbert <kevin.goebbert@valpo.edu>
<kevin.goebbert@valpo.edu> <kevin.goebbert@gmail.com>
<kevin.goebbert@valpo.edu> <kgoebber@users.noreply.github.com>
Tyler Wixtrom <tjwixtrom@gmail.com> <twixtrom@candy.unidata.ucar.edu>
Tyler Wixtrom <tjwixtrom@gmail.com>
Brian Mapes <mapes@miami.edu>
Expand All @@ -11,5 +12,11 @@ Daryl Herzmann <akrherz@iastate.edu>
Kishan Mehta <kishan@mobifly.co.uk>
Matt Wilson <matthew.wilson@valpo.edu>
Andrew Huang <ahuang11@illinois.edu>
<ahuang11@illinois.edu> <huang.andrew12@gmail.com>
<tsupinie@gmail.com> <tsupinie@ou.edu>
Tim Supinie <tsupinie@gmail.com>
Zach Bruick <zachary.bruick@valpo.edu>
Joy Monteiro <joy.merwin@gmail.com>
Steven Decker <sgdecker@envsci.rutgers.edu>
<sgdecker@envsci.rutgers.edu> <decker@envsci.rutgers.edu>
Claude Dicaire <31997745+eliteuser26@users.noreply.github.com>
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,13 @@ matrix:
- VERSIONS="numpy==1.12.0 matplotlib==2.0.0 scipy==0.17.0 pint==0.8 xarray==0.10.7"
- TASK="coverage"
- TEST_OUTPUT_CONTROL=""
- python: "3.6-dev"
env: PRE="--pre"
- python: "3.6-dev"
env: TASK="docs" PRE="--pre"
- python: "3.7-dev"
env: PRE="--pre"
- python: "3.7-dev"
env: TASK="docs" PRE="--pre"
- python: nightly
env: PRE="--pre"
allow_failures:
- python: "3.6-dev"
- python: "3.7-dev"
- python: nightly

Expand Down
5 changes: 5 additions & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Eric Bruning
John Leeman
Jon Thielen
Jonathan Helmus
Joy Monteiro
Kevin Goebbert
Kishan Mehta
Kristen Pozsonyi
Expand All @@ -24,11 +25,15 @@ Matt Wilson
Michael James
Nathan Wendt
Patrick Marsh
Raul Mendez
Ryan May
Sean Arms
Shawn Murdzek
Stefan Hofer
Steven Decker
Tim Supinie
Tyler Wixtrom
Varden Nadkarni
Warren Pettee
Will Holmgren
Zach Bruick
Expand Down

0 comments on commit c1527fc

Please sign in to comment.