From 324f1b5c021514f7bb20abbbadda9bcbf995b2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Fri, 17 Jul 2020 10:37:53 +0200 Subject: [PATCH 1/2] cleanup: remove mention of copyright header in COPYING.txt and CONTRIBUTING.rst --- CONTRIBUTING.rst | 1 - COPYING.txt | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 68fbf28a220..3d540fccb7b 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -790,7 +790,6 @@ Source code style guide * In general, follow PEP-8 guidelines. https://www.python.org/dev/peps/pep-0008/ - * We no longer have a copyright blurb in every source file. * Classes are ``ConjoinedCapitals``, methods and functions are ``lowercase_with_underscores``. * Use 4 spaces, not tabs, to represent indentation. diff --git a/COPYING.txt b/COPYING.txt index f957134dfcd..e8c5a42c32e 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -68,14 +68,3 @@ Development Team. If individual contributors want to maintain a record of what changes/contributions they have specific copyright on, they should indicate their copyright in the commit message of the change, when they commit the change to one of the yt repositories. - -With this in mind, the following banner should be used in any source code file -to indicate the copyright and license terms: - -#----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -#----------------------------------------------------------------------------- From 05330c6cf40de81b0ed069cdd2f39066ff4b7b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Fri, 17 Jul 2020 22:42:26 +0200 Subject: [PATCH 2/2] cleanup: remove remaining occurences of copyright blurb in amrvac and adaptahop frontends --- yt/frontends/adaptahop/__init__.py | 8 -------- yt/frontends/adaptahop/data_structures.py | 7 ------- yt/frontends/adaptahop/definitions.py | 8 -------- yt/frontends/adaptahop/fields.py | 7 ------- yt/frontends/adaptahop/io.py | 7 ------- yt/frontends/amrvac/__init__.py | 7 ------- yt/frontends/amrvac/api.py | 7 ------- yt/frontends/amrvac/data_structures.py | 7 ------- yt/frontends/amrvac/fields.py | 7 ------- yt/frontends/amrvac/io.py | 7 ------- 10 files changed, 72 deletions(-) diff --git a/yt/frontends/adaptahop/__init__.py b/yt/frontends/adaptahop/__init__.py index 0569aaaf58c..f0910e55afc 100644 --- a/yt/frontends/adaptahop/__init__.py +++ b/yt/frontends/adaptahop/__init__.py @@ -5,11 +5,3 @@ """ - -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- diff --git a/yt/frontends/adaptahop/data_structures.py b/yt/frontends/adaptahop/data_structures.py index 0914babab0c..87ebddad7a9 100644 --- a/yt/frontends/adaptahop/data_structures.py +++ b/yt/frontends/adaptahop/data_structures.py @@ -6,13 +6,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- import os import re diff --git a/yt/frontends/adaptahop/definitions.py b/yt/frontends/adaptahop/definitions.py index 4d98e7aa0af..732ebd4db14 100644 --- a/yt/frontends/adaptahop/definitions.py +++ b/yt/frontends/adaptahop/definitions.py @@ -5,14 +5,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- - HEADER_ATTRIBUTES = ( ("npart", 1, "i"), diff --git a/yt/frontends/adaptahop/fields.py b/yt/frontends/adaptahop/fields.py index 0d1df4501d1..f1e193c1ecd 100644 --- a/yt/frontends/adaptahop/fields.py +++ b/yt/frontends/adaptahop/fields.py @@ -6,13 +6,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- from yt.fields.field_info_container import FieldInfoContainer diff --git a/yt/frontends/adaptahop/io.py b/yt/frontends/adaptahop/io.py index f44635d0702..d253b989608 100644 --- a/yt/frontends/adaptahop/io.py +++ b/yt/frontends/adaptahop/io.py @@ -6,13 +6,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- from operator import attrgetter diff --git a/yt/frontends/amrvac/__init__.py b/yt/frontends/amrvac/__init__.py index 0f28e5ef9cd..6d05b21321d 100644 --- a/yt/frontends/amrvac/__init__.py +++ b/yt/frontends/amrvac/__init__.py @@ -5,13 +5,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- from yt.utilities.on_demand_imports import _f90nml as f90nml diff --git a/yt/frontends/amrvac/api.py b/yt/frontends/amrvac/api.py index 3dccf34d36a..4837ef7e4a8 100644 --- a/yt/frontends/amrvac/api.py +++ b/yt/frontends/amrvac/api.py @@ -5,13 +5,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- from .data_structures import AMRVACDataset, AMRVACGrid, AMRVACHierarchy from .fields import AMRVACFieldInfo diff --git a/yt/frontends/amrvac/data_structures.py b/yt/frontends/amrvac/data_structures.py index 7bea80d6435..a390b5aabfd 100644 --- a/yt/frontends/amrvac/data_structures.py +++ b/yt/frontends/amrvac/data_structures.py @@ -5,13 +5,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- import os import stat diff --git a/yt/frontends/amrvac/fields.py b/yt/frontends/amrvac/fields.py index e52c7d6744e..13b60eb4ed3 100644 --- a/yt/frontends/amrvac/fields.py +++ b/yt/frontends/amrvac/fields.py @@ -3,13 +3,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- import functools diff --git a/yt/frontends/amrvac/io.py b/yt/frontends/amrvac/io.py index 2266c0b7b5e..39ed1d50e62 100644 --- a/yt/frontends/amrvac/io.py +++ b/yt/frontends/amrvac/io.py @@ -5,13 +5,6 @@ """ -# ----------------------------------------------------------------------------- -# Copyright (c) 2013, yt Development Team. -# -# Distributed under the terms of the Modified BSD License. -# -# The full license is in the file COPYING.txt, distributed with this software. -# ----------------------------------------------------------------------------- import numpy as np from yt.geometry.selection_routines import GridSelector