Skip to content

Commit

Permalink
Merge pull request pyswmm#1 from OpenWaterAnalytics/master
Browse files Browse the repository at this point in the history
Uptodate
  • Loading branch information
abhiramm7 authored May 27, 2017
2 parents b427a69 + 82f73be commit e8e16c3
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 2 deletions.
10 changes: 10 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Authors ordered by first contribution.
# Generated by tools/update-authors.sh

Bryant E. McDonnell <[email protected]>
James Westover <[email protected]>
Gonzalo Peña-Castellanos <[email protected]>


Authors with Contributions in the Public Domain:
Michael Tryby <[email protected]>
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD-2 Clause License

Copyright (c) 2014-2017, Bryant E. McDonnell
Copyright (c) 2014-2017, Bryant E. McDonnell (see AUTHORS)
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def get_description():
author_email='[email protected]',
install_requires=REQUIREMENTS,
packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
package_data={'': ['lib/windows/swmm5.dll', 'LICENSE.txt']},
package_data={'': ['lib/windows/swmm5.dll', 'LICENSE.txt', 'AUTHORS']},
include_package_data=True,
license="BSD2 License",
keywords="swmm5, swmm, hydraulics, hydrology, modeling, collection system",
Expand Down
31 changes: 31 additions & 0 deletions tools/update-authors.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/sh

##
## This script will auto-generate the AUTHORS attribution file.
## If your name does not display correctly, then please
## update the .mailmap file in the root repo directory
##

git log --reverse --format='%aN <%aE>' | perl -we '
BEGIN {
%seen = (), @authors = ();
}
## Start
push @authors, "Bryant E. McDonnell <bemcdonnell\@gmail.com>\n";
while (<>) {
next if $seen{$_};
next if /Pena-Castellanos/;
next if /unknown/;
next if /Bryant/;
next if /tryby.michael\@epa.gov/;
$seen{$_} = push @authors, $_;
}
END {
print "# Authors ordered by first contribution.\n";
print "# Generated by tools/update-authors.sh\n";
print "\n", @authors;
print "\n\nAuthors with Contributions in the Public Domain:";
print "\nMichael Tryby <tryby.michael\@epa.gov>";
}
' > ../AUTHORS

0 comments on commit e8e16c3

Please sign in to comment.