From bb55bf549ae37bc7ef75c27c3410849633f470fc Mon Sep 17 00:00:00 2001 From: Matt Jia Date: Jun 14 2017 06:47:02 +0000 Subject: use `SPDX-License-Identifier` for license headers --- diff --git a/Jenkinsfile b/Jenkinsfile index 536bf2d..0189147 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,14 +1,6 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ + * SPDX-License-Identifier: GPL-2.0+ +*/ try { // massive try{} catch{} around the entire build for failure notifications diff --git a/fedmsg.d/config.py b/fedmsg.d/config.py index 1d65f9f..6f8dbbf 100644 --- a/fedmsg.d/config.py +++ b/fedmsg.d/config.py @@ -1,17 +1,5 @@ # -*- coding: utf-8 -*- -# -# This file is part of WaiverDB. -# Copyright © 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import socket diff --git a/functional-tests/conftest.py b/functional-tests/conftest.py index 7d16a68..b3c1a61 100644 --- a/functional-tests/conftest.py +++ b/functional-tests/conftest.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ import os import pytest diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py index 167f18a..b7bd6d4 100644 --- a/functional-tests/test_api_v1.py +++ b/functional-tests/test_api_v1.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ def test_get_waivers(waiverdb_url, requests_session): diff --git a/rpmbuild.sh b/rpmbuild.sh index 99e39e6..59eb834 100755 --- a/rpmbuild.sh +++ b/rpmbuild.sh @@ -1,14 +1,6 @@ #!/bin/bash -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ # Builds a development (S)RPM from the current git revision. diff --git a/run-dev-server.py b/run-dev-server.py index 62fbb32..bf92062 100644 --- a/run-dev-server.py +++ b/run-dev-server.py @@ -1,15 +1,6 @@ #!/usr/bin/python -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ from waiverdb.app import create_app, init_db diff --git a/tag-release.sh b/tag-release.sh index 58beddb..105c721 100755 --- a/tag-release.sh +++ b/tag-release.sh @@ -1,9 +1,6 @@ #!/bin/bash -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# SPDX-License-Identifier: GPL-2.0+ set -e diff --git a/tests/conftest.py b/tests/conftest.py index 59a2529..84c111c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ import pytest from waiverdb.app import create_app, init_db diff --git a/tests/test_api_v10.py b/tests/test_api_v10.py index c5abb08..4ff3a05 100644 --- a/tests/test_api_v10.py +++ b/tests/test_api_v10.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import json from .utils import create_waiver diff --git a/tests/test_app.py b/tests/test_app.py index 6ecb5bf..11a5b81 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -1,17 +1,5 @@ -# -*- coding: utf-8 -*- -# -# This file is part of WaiverDB. -# Copyright © 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ + """This module contains tests for :mod:`waiverdb.app`.""" from __future__ import unicode_literals diff --git a/tests/test_auth.py b/tests/test_auth.py index 1969a2e..a06ccce 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import pytest import kerberos diff --git a/tests/test_events.py b/tests/test_events.py index 97b9603..43c3eba 100644 --- a/tests/test_events.py +++ b/tests/test_events.py @@ -1,17 +1,5 @@ -# -*- coding: utf-8 -*- -# -# This file is part of WaiverDB. -# Copyright © 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ + """This module contains tests for :mod:`waiverdb.events`.""" from __future__ import unicode_literals import mock diff --git a/tests/utils.py b/tests/utils.py index 6b7b298..45773fc 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ from waiverdb.models import Waiver diff --git a/waiverdb/__init__.py b/waiverdb/__init__.py index db41e89..1016702 100644 --- a/waiverdb/__init__.py +++ b/waiverdb/__init__.py @@ -1,10 +1 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ diff --git a/waiverdb/api_v1.py b/waiverdb/api_v1.py index 04a363f..194d4f2 100644 --- a/waiverdb/api_v1.py +++ b/waiverdb/api_v1.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ from flask import Blueprint, request from flask_restful import Resource, Api, reqparse, marshal_with diff --git a/waiverdb/app.py b/waiverdb/app.py index 130af91..dd09bfb 100644 --- a/waiverdb/app.py +++ b/waiverdb/app.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import os import urlparse diff --git a/waiverdb/auth.py b/waiverdb/auth.py index cb796fa..83beb3c 100644 --- a/waiverdb/auth.py +++ b/waiverdb/auth.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import os diff --git a/waiverdb/config.py b/waiverdb/config.py index 8b7a07a..e21b262 100644 --- a/waiverdb/config.py +++ b/waiverdb/config.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import os diff --git a/waiverdb/events.py b/waiverdb/events.py index f3d7289..6cbd07c 100644 --- a/waiverdb/events.py +++ b/waiverdb/events.py @@ -1,17 +1,4 @@ -# -*- coding: utf-8 -*- -# -# This file is part of WaiverDB. -# Copyright © 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ """ This module contains a set of `SQLAlchemy event`_ hooks. diff --git a/waiverdb/fields.py b/waiverdb/fields.py index 1df599e..1bd1307 100644 --- a/waiverdb/fields.py +++ b/waiverdb/fields.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ from flask_restful import fields diff --git a/waiverdb/logger.py b/waiverdb/logger.py index 49e0c1a..7051982 100644 --- a/waiverdb/logger.py +++ b/waiverdb/logger.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import logging import sys diff --git a/waiverdb/models/__init__.py b/waiverdb/models/__init__.py index 27e8766..3d85cfc 100644 --- a/waiverdb/models/__init__.py +++ b/waiverdb/models/__init__.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ from .base import db # noqa: F401 from .waivers import Waiver # noqa: F401 diff --git a/waiverdb/models/base.py b/waiverdb/models/base.py index de3d3fd..fe3b648 100644 --- a/waiverdb/models/base.py +++ b/waiverdb/models/base.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ from flask_sqlalchemy import SQLAlchemy diff --git a/waiverdb/models/waivers.py b/waiverdb/models/waivers.py index d554f82..6760ca0 100644 --- a/waiverdb/models/waivers.py +++ b/waiverdb/models/waivers.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import datetime from .base import db diff --git a/waiverdb/utils.py b/waiverdb/utils.py index 441b2fb..83fa825 100644 --- a/waiverdb/utils.py +++ b/waiverdb/utils.py @@ -1,13 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# SPDX-License-Identifier: GPL-2.0+ import datetime import functools diff --git a/waiverdb/wsgi.py b/waiverdb/wsgi.py index 19e6300..709c003 100644 --- a/waiverdb/wsgi.py +++ b/waiverdb/wsgi.py @@ -1,14 +1,4 @@ - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# +# SPDX-License-Identifier: GPL-2.0+ from waiverdb.app import create_app, init_db app = create_app()