From 3be005494aa7b54bede9bb3d39f5e339ca16ed19 Mon Sep 17 00:00:00 2001
From: Duncan Macleod <macleoddm@cardiff.ac.uk>
Date: Mon, 17 Mar 2025 10:12:05 +0000
Subject: [PATCH 1/2] update license headers
Mainly updating http to https in the GPL header
Update some license headers to not include a physical address for FSF
---
LICENSE | 8 ++++----
debian/copyright | 4 ++--
gwdatafind/__init__.py | 2 +-
gwdatafind/__main__.py | 2 +-
gwdatafind/api.py | 23 ++++++++++++-----------
gwdatafind/io.py | 2 +-
gwdatafind/tests/__init__.py | 2 +-
gwdatafind/tests/test_api.py | 2 +-
gwdatafind/tests/test_main.py | 2 +-
gwdatafind/tests/test_ui.py | 2 +-
gwdatafind/tests/test_utils.py | 23 ++++++++++++-----------
gwdatafind/ui.py | 2 +-
gwdatafind/utils.py | 23 ++++++++++++-----------
13 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/LICENSE b/LICENSE
index 94a9ed0..f288702 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/debian/copyright b/debian/copyright
index cb06dc2..e5d68c6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,12 +6,12 @@ Source: https://git.ligo.org/lscsoft/gwdatafind
Files: *
Copyright: 2018-2022 Cardiff University
License: GPL-3+
- This program is free software: you can redistribute it and/or modify
+ GWDataFind 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 3 of the License, or
(at your option) any later version.
.
- This package is distributed in the hope that it will be useful,
+ GWDataFind 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.
diff --git a/gwdatafind/__init__.py b/gwdatafind/__init__.py
index cb6663f..b74957d 100644
--- a/gwdatafind/__init__.py
+++ b/gwdatafind/__init__.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""The client library for the GWDataFind service.
diff --git a/gwdatafind/__main__.py b/gwdatafind/__main__.py
index 486a455..410ed03 100644
--- a/gwdatafind/__main__.py
+++ b/gwdatafind/__main__.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Query a GWDataFind server for information."""
diff --git a/gwdatafind/api.py b/gwdatafind/api.py
index a8b5f57..be7c92b 100644
--- a/gwdatafind/api.py
+++ b/gwdatafind/api.py
@@ -1,18 +1,19 @@
# Copyright (C) 2012-2015 Scott Koranda, 2015+ Duncan Macleod
#
-# 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 file is part of GWDataFind.
#
-# 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.
+# GWDataFind 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 3 of the License, or
+# (at your option) any later version.
#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# GWDataFind 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""API URL implementation for GWDataFind.
diff --git a/gwdatafind/io.py b/gwdatafind/io.py
index cc70276..10193b9 100644
--- a/gwdatafind/io.py
+++ b/gwdatafind/io.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""I/O (mainly O) routines for GWDataFind."""
diff --git a/gwdatafind/tests/__init__.py b/gwdatafind/tests/__init__.py
index 8675b09..07ecca6 100644
--- a/gwdatafind/tests/__init__.py
+++ b/gwdatafind/tests/__init__.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Test :mod:`gwdatafind`."""
diff --git a/gwdatafind/tests/test_api.py b/gwdatafind/tests/test_api.py
index ee5e825..f324ff8 100644
--- a/gwdatafind/tests/test_api.py
+++ b/gwdatafind/tests/test_api.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Test suite for `gwdatafind.api`.
diff --git a/gwdatafind/tests/test_main.py b/gwdatafind/tests/test_main.py
index f6a88d4..5e91c5f 100644
--- a/gwdatafind/tests/test_main.py
+++ b/gwdatafind/tests/test_main.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Tests for :mod:`gwdatafind.__main__` (the CLI)."""
diff --git a/gwdatafind/tests/test_ui.py b/gwdatafind/tests/test_ui.py
index c38bab4..9a7ad5a 100644
--- a/gwdatafind/tests/test_ui.py
+++ b/gwdatafind/tests/test_ui.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Test :mod:`gwdatafind.ui`."""
diff --git a/gwdatafind/tests/test_utils.py b/gwdatafind/tests/test_utils.py
index d7a6c40..6dad730 100644
--- a/gwdatafind/tests/test_utils.py
+++ b/gwdatafind/tests/test_utils.py
@@ -2,19 +2,20 @@
# Louisiana State University (2015-2017)
# Cardiff University (2017-2022)
#
-# 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 file is part of GWDataFind.
#
-# 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.
+# GWDataFind 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 3 of the License, or
+# (at your option) any later version.
#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# GWDataFind 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Tests for :mod:`gwdatafind.utils`."""
diff --git a/gwdatafind/ui.py b/gwdatafind/ui.py
index 4c051af..e1872a5 100644
--- a/gwdatafind/ui.py
+++ b/gwdatafind/ui.py
@@ -13,7 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GWDataFind. If not, see <http://www.gnu.org/licenses/>.
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""User interface functions for GWDataFind.
diff --git a/gwdatafind/utils.py b/gwdatafind/utils.py
index 7d32313..7f75342 100644
--- a/gwdatafind/utils.py
+++ b/gwdatafind/utils.py
@@ -2,19 +2,20 @@
# Louisiana State University (2015-2017)
# Cardiff University (2017-2022)
#
-# 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 file is part of GWDataFind.
#
-# 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.
+# GWDataFind 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 3 of the License, or
+# (at your option) any later version.
#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# GWDataFind 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with GWDataFind. If not, see <https://www.gnu.org/licenses/>.
"""Utilities for the GW datafind service."""
--
GitLab
From 1d980cf1f6b98238087d0ed0582344355a321d9f Mon Sep 17 00:00:00 2001
From: Duncan Macleod <macleoddm@cardiff.ac.uk>
Date: Mon, 17 Mar 2025 10:12:20 +0000
Subject: [PATCH 2/2] update copyright years
---
debian/copyright | 2 +-
gwdatafind/__init__.py | 2 +-
gwdatafind/__main__.py | 2 +-
gwdatafind/api.py | 4 +++-
gwdatafind/io.py | 2 +-
gwdatafind/tests/__init__.py | 2 +-
gwdatafind/tests/test_api.py | 2 +-
gwdatafind/tests/test_main.py | 2 +-
gwdatafind/tests/test_ui.py | 2 +-
gwdatafind/tests/test_utils.py | 6 +++---
gwdatafind/ui.py | 2 +-
gwdatafind/utils.py | 6 +++---
12 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index e5d68c6..6b2afc2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Duncan Macleod <duncan.macleod@ligo.org>
Source: https://git.ligo.org/lscsoft/gwdatafind
Files: *
-Copyright: 2018-2022 Cardiff University
+Copyright: 2018-2025 Cardiff University
License: GPL-3+
GWDataFind is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/gwdatafind/__init__.py b/gwdatafind/__init__.py
index b74957d..466ed5b 100644
--- a/gwdatafind/__init__.py
+++ b/gwdatafind/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2017-2022)
+# Copyright (C) 2017-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/__main__.py b/gwdatafind/__main__.py
index 410ed03..a214fca 100644
--- a/gwdatafind/__main__.py
+++ b/gwdatafind/__main__.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2017-2022)
+# Copyright (C) 2017-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/api.py b/gwdatafind/api.py
index be7c92b..13a4d41 100644
--- a/gwdatafind/api.py
+++ b/gwdatafind/api.py
@@ -1,4 +1,6 @@
-# Copyright (C) 2012-2015 Scott Koranda, 2015+ Duncan Macleod
+# Copyright (C) 2012-2015 University of Wisconsin-Milwaukee
+# 2015-2017 Louisiana State University
+# 2017-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/io.py b/gwdatafind/io.py
index 10193b9..3124866 100644
--- a/gwdatafind/io.py
+++ b/gwdatafind/io.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2022)
+# Copyright (C) 2022-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/tests/__init__.py b/gwdatafind/tests/__init__.py
index 07ecca6..a97580c 100644
--- a/gwdatafind/tests/__init__.py
+++ b/gwdatafind/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2018-2022)
+# Copyright (C) 2018-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/tests/test_api.py b/gwdatafind/tests/test_api.py
index f324ff8..fb5cc69 100644
--- a/gwdatafind/tests/test_api.py
+++ b/gwdatafind/tests/test_api.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2018-2022)
+# Copyright (C) 2018-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/tests/test_main.py b/gwdatafind/tests/test_main.py
index 5e91c5f..0b8f61f 100644
--- a/gwdatafind/tests/test_main.py
+++ b/gwdatafind/tests/test_main.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2018-2022)
+# Copyright (C) 2018-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/tests/test_ui.py b/gwdatafind/tests/test_ui.py
index 9a7ad5a..dee7d1f 100644
--- a/gwdatafind/tests/test_ui.py
+++ b/gwdatafind/tests/test_ui.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2018-2022)
+# Copyright (C) 2018-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/tests/test_utils.py b/gwdatafind/tests/test_utils.py
index 6dad730..3c85869 100644
--- a/gwdatafind/tests/test_utils.py
+++ b/gwdatafind/tests/test_utils.py
@@ -1,6 +1,6 @@
-# Copyright (C) Scott Koranda (2012-2015)
-# Louisiana State University (2015-2017)
-# Cardiff University (2017-2022)
+# Copyright (C) 2012-2015 University of Wisconsin-Milwaukee
+# 2015-2017 Louisiana State University
+# 2017-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/ui.py b/gwdatafind/ui.py
index e1872a5..a95164e 100644
--- a/gwdatafind/ui.py
+++ b/gwdatafind/ui.py
@@ -1,4 +1,4 @@
-# Copyright (C) Cardiff University (2018-2022)
+# Copyright (C) 2018-2025 Cardiff University
#
# This file is part of GWDataFind.
#
diff --git a/gwdatafind/utils.py b/gwdatafind/utils.py
index 7f75342..e36cafa 100644
--- a/gwdatafind/utils.py
+++ b/gwdatafind/utils.py
@@ -1,6 +1,6 @@
-# Copyright (C) Scott Koranda (2012-2015)
-# Louisiana State University (2015-2017)
-# Cardiff University (2017-2022)
+# Copyright (C) 2012-2015 University of Wisconsin-Milwaukee
+# 2015-2017 Louisiana State University
+# 2017-2025 Cardiff University
#
# This file is part of GWDataFind.
#
--
GitLab