From cd63085011ec98a8949fca48217e4efad5558908 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 2 Oct 2018 20:53:01 +0000 Subject: [PATCH] Generalize copyright headers in files Since we're distributing an AUTHORS file even in wheel packages now replace the specific copyright strings with ones which generally mention "mudpy authors" instead, refer to the AUTHORS file and Git history from the LICENSE file, and embed the generated list of authors in rendered versions of the license. --- .gitignore | 6 +++--- .yamllint | 6 +++--- LICENSE | 3 ++- README | 7 +++---- doc/requirements.txt | 6 +++--- doc/source/_static/logo.svg | 2 +- doc/source/api.rst | 7 +++---- doc/source/changelog.rst | 7 +++---- doc/source/clients.rst | 7 +++---- doc/source/coder.rst | 7 +++---- doc/source/conf.py | 6 +++--- doc/source/configuration.rst | 7 +++---- doc/source/data_model.rst | 7 +++---- doc/source/index.rst | 7 +++---- doc/source/license.rst | 15 +++++++++++---- etc/mudpy.yaml | 6 +++--- mudpy/__init__.py | 6 +++--- mudpy/daemon.py | 6 +++--- mudpy/data.py | 6 +++--- mudpy/misc.py | 6 +++--- mudpy/password.py | 6 +++--- mudpy/telnet.py | 6 +++--- mudpy/tests/fixtures/test_daemon.yaml | 6 +++--- mudpy/tests/selftest.py | 6 +++--- mudpy/version.py | 6 +++--- requirements.txt | 6 +++--- sample/__init__.yaml | 6 +++--- sample/area.yaml | 6 +++--- sample/prop.yaml | 6 +++--- setup.cfg | 6 +++--- setup.py | 6 +++--- share/archetype.yaml | 6 +++--- share/command.yaml | 6 +++--- share/menu.yaml | 6 +++--- test-requirements.txt | 6 +++--- tox.ini | 6 +++--- 36 files changed, 113 insertions(+), 113 deletions(-) diff --git a/.gitignore b/.gitignore index 8334b06..bbf5674 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -# Copyright (c) 2014-2017 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2014-2017 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. *.egg-info/ *.egg/ diff --git a/.yamllint b/.yamllint index c842d72..a477f75 100644 --- a/.yamllint +++ b/.yamllint @@ -1,6 +1,6 @@ -# Copyright (c) 2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. extends: default rules: diff --git a/LICENSE b/LICENSE index 2584f62..155b853 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,8 @@ preferred license of many projects (OpenBSD, for example). copyright notice ---------------- -Copyright (c) 2004-2018 Jeremy Stanley +Copyright (c) 2004-2018 Jeremy Stanley and other +mudpy authors listed in the Git history or AUTHORS file. permission notice ----------------- diff --git a/README b/README index 6375283..d5c1d82 100644 --- a/README +++ b/README @@ -2,10 +2,9 @@ mudpy ======= -.. Copyright (c) 2004-2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. The mudpy project aims to create a simple, generic, cross-platform, freely-redistributable MUD core engine which can be easily understood diff --git a/doc/requirements.txt b/doc/requirements.txt index ca1e4d4..e13feea 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,5 +1,5 @@ -# Copyright (c) 2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. sphinx diff --git a/doc/source/_static/logo.svg b/doc/source/_static/logo.svg index 626e361..d72cc61 100644 --- a/doc/source/_static/logo.svg +++ b/doc/source/_static/logo.svg @@ -31,7 +31,7 @@ - Copyright (c) 2004-2018 Jeremy Stanley mailto:fungi@yuggoth.org. Permission to use, copy, modify, and distribute this software is granted under terms provided in the LICENSE file distributed with this software. + Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, modify, and distribute this software is granted under terms provided in the LICENSE file distributed with this software. Monogram box logo used as an identifying icon for the mudpy MUD server engine. diff --git a/doc/source/api.rst b/doc/source/api.rst index 875bd5f..785e136 100644 --- a/doc/source/api.rst +++ b/doc/source/api.rst @@ -1,7 +1,6 @@ -.. Copyright (c) 2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. =============== mudpy package diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index b00bd96..fdc1970 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -1,7 +1,6 @@ -.. Copyright (c) 2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. =========== changelog diff --git a/doc/source/clients.rst b/doc/source/clients.rst index 29d1fb9..00b05b1 100644 --- a/doc/source/clients.rst +++ b/doc/source/clients.rst @@ -2,10 +2,9 @@ clients ========= -.. Copyright (c) 2004-2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. mudpy handles input, output and formatting of UTF-8 encoded, multi-byte and wide characters, when coupled with a supporting diff --git a/doc/source/coder.rst b/doc/source/coder.rst index 5a86659..0487cb8 100644 --- a/doc/source/coder.rst +++ b/doc/source/coder.rst @@ -2,10 +2,9 @@ coder guide ============= -.. Copyright (c) 2004-2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. This guide attempts to embody a rudimentary set of rules for developer submissions of source code and documentation targeted for inclusion diff --git a/doc/source/conf.py b/doc/source/conf.py index 1690dbc..17b9eba 100755 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,6 +1,6 @@ -# Copyright (c) 2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import os import sys diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index f2641d4..bca9161 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -2,10 +2,9 @@ configuration =============== -.. Copyright (c) 2004-2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. .mudpy.filing ------------- diff --git a/doc/source/data_model.rst b/doc/source/data_model.rst index 13b44ae..af7a4b0 100644 --- a/doc/source/data_model.rst +++ b/doc/source/data_model.rst @@ -2,10 +2,9 @@ data model ============ -.. Copyright (c) 2004-2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. One of the primary goals for mudpy is to apply a consistent data model for all information, from configuration and preferences to diff --git a/doc/source/index.rst b/doc/source/index.rst index 3b219d5..e130010 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,7 +1,6 @@ -.. Copyright (c) 2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. .. title:: about .. meta:: diff --git a/doc/source/license.rst b/doc/source/license.rst index eb3da91..83541a2 100644 --- a/doc/source/license.rst +++ b/doc/source/license.rst @@ -1,6 +1,13 @@ -.. Copyright (c) 2018 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is - granted under terms provided in the LICENSE file distributed with - this software. +.. Copyright (c) 2018 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. .. include:: ../../LICENSE + +authors +------- +This list of authors is automatically generated from the `Git repository +history `_: + +.. include:: ../../AUTHORS + :literal: diff --git a/etc/mudpy.yaml b/etc/mudpy.yaml index 45f1d14..3cc39d9 100644 --- a/etc/mudpy.yaml +++ b/etc/mudpy.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is the top-level configuration file for mudpy service. diff --git a/mudpy/__init__.py b/mudpy/__init__.py index c148bda..38a69af 100644 --- a/mudpy/__init__.py +++ b/mudpy/__init__.py @@ -1,8 +1,8 @@ """Core modules package for the mudpy engine.""" -# Copyright (c) 2004-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import importlib # noqa (referenced via exec of string literal below) diff --git a/mudpy/daemon.py b/mudpy/daemon.py index 436a5ef..0366ab8 100644 --- a/mudpy/daemon.py +++ b/mudpy/daemon.py @@ -1,6 +1,6 @@ -# Copyright (c) 2004-2017 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. # core objects for the mudpy engine import importlib diff --git a/mudpy/data.py b/mudpy/data.py index be88d65..25b423b 100644 --- a/mudpy/data.py +++ b/mudpy/data.py @@ -1,8 +1,8 @@ """Data interface functions for the mudpy engine.""" -# Copyright (c) 2004-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import os import re diff --git a/mudpy/misc.py b/mudpy/misc.py index 6b24e1b..7698e81 100644 --- a/mudpy/misc.py +++ b/mudpy/misc.py @@ -1,8 +1,8 @@ """Miscellaneous functions for the mudpy engine.""" -# Copyright (c) 2004-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import codecs import os diff --git a/mudpy/password.py b/mudpy/password.py index f90fe88..f5638cb 100644 --- a/mudpy/password.py +++ b/mudpy/password.py @@ -1,8 +1,8 @@ """Password hashing functions and constants for the mudpy engine.""" -# Copyright (c) 2004-2017 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import passlib.context diff --git a/mudpy/telnet.py b/mudpy/telnet.py index 0cc29b8..0ce9aec 100644 --- a/mudpy/telnet.py +++ b/mudpy/telnet.py @@ -1,8 +1,8 @@ """Telnet functions and constants for the mudpy engine.""" -# Copyright (c) 2004-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import mudpy diff --git a/mudpy/tests/fixtures/test_daemon.yaml b/mudpy/tests/fixtures/test_daemon.yaml index 6814feb..a2bf565 100644 --- a/mudpy/tests/fixtures/test_daemon.yaml +++ b/mudpy/tests/fixtures/test_daemon.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is an alternative top-level configuration with some values adjusted to better suit automated testing scenarios. diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py index 3012c61..c3c5dea 100644 --- a/mudpy/tests/selftest.py +++ b/mudpy/tests/selftest.py @@ -1,6 +1,6 @@ -# Copyright (c) 2004-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2004-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import os import pathlib diff --git a/mudpy/version.py b/mudpy/version.py index 58d7e7f..0b4ad79 100644 --- a/mudpy/version.py +++ b/mudpy/version.py @@ -1,8 +1,8 @@ """Version and diagnostic information for the mudpy engine.""" -# Copyright (c) 2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import json import pkg_resources diff --git a/requirements.txt b/requirements.txt index f03bf88..092317a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -# Copyright (c) 2014-2016 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2014-2016 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. passlib pyyaml diff --git a/sample/__init__.yaml b/sample/__init__.yaml index f4dde51..ea45b9c 100644 --- a/sample/__init__.yaml +++ b/sample/__init__.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is an index file for a sample collection of elements. diff --git a/sample/area.yaml b/sample/area.yaml index 66f2b23..a2fd333 100644 --- a/sample/area.yaml +++ b/sample/area.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is a set of sample locations for testing and demonstration purposes. diff --git a/sample/prop.yaml b/sample/prop.yaml index bdf254d..8340aa7 100644 --- a/sample/prop.yaml +++ b/sample/prop.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is a set of sample objects for testing and demonstration purposes. diff --git a/setup.cfg b/setup.cfg index d397c14..5da64f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ -# Copyright (c) 2016-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2016-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. [metadata] name = mudpy diff --git a/setup.py b/setup.py index 7e4f9f6..9288753 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ -# Copyright (c) 2016 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2016 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. import setuptools diff --git a/share/archetype.yaml b/share/archetype.yaml index c51a639..5d45e1a 100644 --- a/share/archetype.yaml +++ b/share/archetype.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: These are the base archetypes from which other elements inherit. diff --git a/share/command.yaml b/share/command.yaml index 0c09076..85a1e91 100644 --- a/share/command.yaml +++ b/share/command.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is the standard library of command definitions. diff --git a/share/menu.yaml b/share/menu.yaml index 07a4601..74085c0 100644 --- a/share/menu.yaml +++ b/share/menu.yaml @@ -1,7 +1,7 @@ --- -_copy: Copyright (c) 2004-2017 Jeremy Stanley . - Permission to use, copy, modify, and distribute this software is granted - under terms provided in the LICENSE file distributed with this software. +_copy: Copyright (c) 2004-2017 mudpy authors. Permission to use, copy, + modify, and distribute this software is granted under terms + provided in the LICENSE file distributed with this software. _desc: This is the standard library of menu definitions. diff --git a/test-requirements.txt b/test-requirements.txt index 47f4a94..2021c19 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ -# Copyright (c) 2016-2017 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2016-2017 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. flake8 yamllint diff --git a/tox.ini b/tox.ini index 2220282..9e81bde 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ -# Copyright (c) 2016-2018 Jeremy Stanley . Permission -# to use, copy, modify, and distribute this software is granted under -# terms provided in the LICENSE file distributed with this software. +# Copyright (c) 2016-2018 mudpy authors. Permission to use, copy, +# modify, and distribute this software is granted under terms +# provided in the LICENSE file distributed with this software. [tox] minversion = 3.1 -- 2.11.0