[ARVADOS] updated: 1.1.2-6-gf6d560c
Git user
git at public.curoverse.com
Thu Dec 21 13:50:21 EST 2017
Summary of changes:
README.md | 14 +-
build/check-copyright-notices | 301 ++++++++++++++++++++++--------------------
2 files changed, 164 insertions(+), 151 deletions(-)
via f6d560c1a46b05802ad81dc4a815d28a50c5b8f4 (commit)
via 5b819f447743fbd8281dcf26143ad556cd710cad (commit)
from c152ee1d170bf419ef49241cbde030e8fce68882 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f6d560c1a46b05802ad81dc4a815d28a50c5b8f4
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Dec 21 13:48:54 2017 -0500
Note DCO requirement.
Fix some typos.
No issue #
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/README.md b/README.md
index f5940da..c480ffd 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ doc/README.textile for instructions.
## Community
-The [#arvados](irc://irc.oftc.net:6667/#arvados IRC) (Internet Relay Chat)
+The [#arvados](irc://irc.oftc.net:6667/#arvados) IRC (Internet Relay Chat)
channel at the
[Open and Free Technology Community (irc.oftc.net)](http://www.oftc.net/oftc/)
is available for live discussion and support. You can use a traditional IRC
@@ -58,7 +58,7 @@ is a forum for general discussion, questions, and news about Arvados
development. The
[Arvados developer mailing list](http://lists.arvados.org/mailman/listinfo/arvados-dev)
is a forum for more technical discussion, intended for developers and
-contributers to Arvados.
+contributors to Arvados.
## Development
@@ -73,6 +73,10 @@ Instructions for setting up a development environment and working on specific
components can be found on the
["Hacking Arvados" page of the Arvados wiki](https://dev.arvados.org/projects/arvados/wiki/Hacking).
+## Contributing
+
+When making a pull request, please ensure *every git commit message* includes a one-line [Developer Certificate of Origin](https://dev.arvados.org/projects/arvados/wiki/Developer_Certificate_Of_Origin). If you have already made commits without it, fix them with `git commit --amend` or `git rebase`.
+
## Licensing
Arvados is Free Software. See COPYING for information about Arvados Free
commit 5b819f447743fbd8281dcf26143ad556cd710cad
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Dec 21 13:25:18 2017 -0500
Fix copyright header, and copyright header checker exit code.
No issue #
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/README.md b/README.md
index 367c3e8..f5940da 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[//]: # Copyright (C) The Arvados Authors. All rights reserved.
-[//]: #
-[//]: # SPDX-License-Identifier: CC-BY-SA-3.0
+[comment]: # (Copyright © The Arvados Authors. All rights reserved.)
+[comment]: # ()
+[comment]: # (SPDX-License-Identifier: CC-BY-SA-3.0)
[Arvados](https://arvados.org) is a free software distributed computing platform
for bioinformatics, data science, and high throughput analysis of massive data
diff --git a/build/check-copyright-notices b/build/check-copyright-notices
index 5298371..f087188 100755
--- a/build/check-copyright-notices
+++ b/build/check-copyright-notices
@@ -49,163 +49,172 @@ EOF
IFS=$'\n' read -a ignores -r -d $'\000' <.licenseignore || true
result=0
-git ls-files -z ${@} | \
- while read -rd $'\000' fnm
+
+coproc git ls-files -z ${@} </dev/null
+while read -rd $'\000' fnm
+do
+ grepAfter=2
+ grepBefore=0
+ cs=
+ cc=
+ ce=
+ fixer=
+ if [[ ! -f ${fnm} ]] || [[ -L ${fnm} ]] || [[ ! -s ${fnm} ]]
+ then
+ continue
+ fi
+
+ ignore=
+ for pattern in "${ignores[@]}"
do
- grepAfter=2
- grepBefore=0
- cs=
- cc=
- ce=
- fixer=
- if [[ ! -f ${fnm} ]] || [[ -L ${fnm} ]] || [[ ! -s ${fnm} ]]
+ if [[ ${fnm} == ${pattern} ]]
then
- continue
+ ignore=1
fi
+ done
+ if [[ ${ignore} = 1 ]]; then continue; fi
- ignore=
- for pattern in "${ignores[@]}"
- do
- if [[ ${fnm} == ${pattern} ]]
+ case ${fnm} in
+ Makefile | */Makefile \
+ | *.dockerfile | */Dockerfile.* | */Dockerfile | *.dockerignore \
+ | */MANIFEST.in | */fuse.conf | */gitolite.rc \
+ | *.pl | *.pm | *.PL \
+ | *.rb | *.rb.example | *.rake | *.ru \
+ | *.gemspec | */Gemfile | */Rakefile \
+ | services/login-sync/bin/* \
+ | sdk/cli/bin/* \
+ | *.py \
+ | sdk/python/bin/arv-* \
+ | sdk/cwl/bin/* \
+ | services/nodemanager/bin/* \
+ | services/fuse/bin/* \
+ | tools/crunchstat-summary/bin/* \
+ | crunch_scripts/* \
+ | *.yaml | *.yml | *.yml.example | *.cwl \
+ | *.sh | *.service \
+ | */run | */run-service | */restart-dns-server \
+ | */nodemanager/doc/*.cfg \
+ | */nodemanager/tests/fake*.cfg.template \
+ | */nginx.conf \
+ | build/build.list)
+ fixer=fixer
+ cc="#"
+ ;;
+ *.md)
+ fixer=fixer
+ cc="[//]: #"
+ ;;
+ *.rst)
+ fixer=fixer
+ cc=".."
+ ;;
+ *.erb)
+ fixer=fixer
+ cs="<%# "
+ cc=""
+ ce=" %>"
+ ;;
+ *.liquid)
+ fixer=fixer
+ cs=$'{% comment %}\n'
+ cc=""
+ ce=$'\n{% endcomment %}'
+ grepAfter=3
+ grepBefore=1
+ ;;
+ *.textile)
+ fixer=fixer
+ cs="###. "
+ cc="...."
+ ce=
+ ;;
+ *.css)
+ fixer=fixer
+ cs="/* "
+ cc=""
+ ce=" */"
+ ;;
+ *.coffee)
+ fixer=fixer
+ cs="### "
+ cc=""
+ ce=" ###"
+ ;;
+ *.go | *.scss | *.java | *.js)
+ fixer=fixer
+ cc="//"
+ ;;
+ *.sql)
+ fixer=fixer
+ cc="--"
+ ;;
+ *.html | *.svg)
+ fixer=fixer
+ cs="<!-- "
+ cc=""
+ ce=" -->"
+ ;;
+ *)
+ cc="#"
+ hashbang=$(head -n1 ${fnm})
+ if [[ ${hashbang} = "#!/bin/sh" ]] || [[ ${hashbang} = "#!/bin/bash" ]]
then
- ignore=1
- fi
- done
- if [[ ${ignore} = 1 ]]; then continue; fi
-
- case ${fnm} in
- Makefile | */Makefile \
- | *.dockerfile | */Dockerfile.* | */Dockerfile | *.dockerignore \
- | */MANIFEST.in | */fuse.conf | */gitolite.rc \
- | *.pl | *.pm | *.PL \
- | *.rb | *.rb.example | *.rake | *.ru \
- | *.gemspec | */Gemfile | */Rakefile \
- | services/login-sync/bin/* \
- | sdk/cli/bin/* \
- | *.py \
- | sdk/python/bin/arv-* \
- | sdk/cwl/bin/* \
- | services/nodemanager/bin/* \
- | services/fuse/bin/* \
- | tools/crunchstat-summary/bin/* \
- | crunch_scripts/* \
- | *.yaml | *.yml | *.yml.example | *.cwl \
- | *.sh | *.service \
- | */run | */run-service | */restart-dns-server \
- | */nodemanager/doc/*.cfg \
- | */nodemanager/tests/fake*.cfg.template \
- | */nginx.conf \
- | build/build.list)
- fixer=fixer
- cc="#"
- ;;
- *.md)
- fixer=fixer
- cc="[//]: #"
- ;;
- *.rst)
- fixer=fixer
- cc=".."
- ;;
- *.erb)
- fixer=fixer
- cs="<%# "
- cc=""
- ce=" %>"
- ;;
- *.liquid)
- fixer=fixer
- cs=$'{% comment %}\n'
- cc=""
- ce=$'\n{% endcomment %}'
- grepAfter=3
- grepBefore=1
- ;;
- *.textile)
- fixer=fixer
- cs="###. "
- cc="...."
- ce=
- ;;
- *.css)
- fixer=fixer
- cs="/* "
- cc=""
- ce=" */"
- ;;
- *.coffee)
fixer=fixer
- cs="### "
- cc=""
- ce=" ###"
- ;;
- *.go | *.scss | *.java | *.js)
- fixer=fixer
- cc="//"
- ;;
- *.sql)
- fixer=fixer
- cc="--"
- ;;
- *.html | *.svg)
- fixer=fixer
- cs="<!-- "
- cc=""
- ce=" -->"
- ;;
- *)
- cc="#"
- hashbang=$(head -n1 ${fnm})
- if [[ ${hashbang} = "#!/bin/sh" ]] || [[ ${hashbang} = "#!/bin/bash" ]]
- then
- fixer=fixer
- fi
- ;;
- esac
- wantGPL="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
+ fi
+ ;;
+ esac
+ wantGPL="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
${cc}
${cc}${cc:+ }SPDX-License-Identifier: AGPL-3.0${ce}"
- wantApache="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
+ wantApache="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
${cc}
${cc}${cc:+ }SPDX-License-Identifier: Apache-2.0${ce}"
- wantBYSA="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
+ wantBYSA="${cs:-${cc}${cc:+ }}Copyright (C) The Arvados Authors. All rights reserved.
${cc}
${cc}${cc:+ }SPDX-License-Identifier: CC-BY-SA-3.0${ce}"
- found=$(head -n20 "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*Arvados' || true)
- case ${fnm} in
- Makefile | build/* | lib/* | tools/* | apps/* | services/* | sdk/cli/bin/crunch-job)
- want=${wantGPL}
- ;;
- crunch_scripts/* | backports/* | docker/* | sdk/*)
- want=${wantApache}
- ;;
- README.md | doc/*)
- want=${wantBYSA}
- ;;
- *)
- want=
- ;;
- esac
- case "$found" in
- "$wantGPL")
- ;;
- "$wantApache")
- ;;
- "$wantBYSA")
- ;;
- "")
- if [[ -z ${found} ]] && [[ -n ${want} ]] && [[ $fix = true ]] && [[ $fixer != "" ]]
- then
- ${fixer} ${fnm}
- else
- echo "missing copyright notice: $fnm"
- result=1
- fi
- ;;
- *)
- echo "nonstandard copyright notice: $fnm '${found}'"
+ wantBYSAmd="[comment]: # (Copyright © The Arvados Authors. All rights reserved.)
+[comment]: # ()
+[comment]: # (SPDX-License-Identifier: CC-BY-SA-3.0)"
+ found=$(head -n20 "$fnm" | egrep -A${grepAfter} -B${grepBefore} 'Copyright.*Arvados' || true)
+ case ${fnm} in
+ Makefile | build/* | lib/* | tools/* | apps/* | services/* | sdk/cli/bin/crunch-job)
+ want=${wantGPL}
+ ;;
+ crunch_scripts/* | backports/* | docker/* | sdk/*)
+ want=${wantApache}
+ ;;
+ doc/*)
+ want=${wantBYSA}
+ ;;
+ README.md)
+ want=${wantBYSAmd}
+ ;;
+ *)
+ want=
+ ;;
+ esac
+ case "$found" in
+ "$wantGPL")
+ ;;
+ "$wantApache")
+ ;;
+ "$wantBYSA")
+ ;;
+ "$wantBYSAmd")
+ ;;
+ "")
+ if [[ -z ${found} ]] && [[ -n ${want} ]] && [[ $fix = true ]] && [[ $fixer != "" ]]
+ then
+ ${fixer} ${fnm}
+ else
+ echo "missing copyright notice: $fnm"
result=1
- ;;
- esac
- done
+ fi
+ ;;
+ *)
+ echo "nonstandard copyright notice: $fnm '${found}'"
+ result=1
+ ;;
+ esac
+done <&${COPROC[0]}
exit $result
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list