From 4197263dff19a79f13cd86f6cdc9a0ec6c06da92 Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark (Alex)" Date: Sat, 23 Mar 2024 09:40:39 -0400 Subject: [PATCH 1/3] Clean up authors and contributors - `s/Jeffrey A. Clark (Alex)/Jeffrey A. Clark/g`. People can figure out that I am Alex. - We've added "contributors" to Fredrik's copyright statements because it seems appropriate that it be there based on: https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst#02b5-117. - Fredrik is the PIL author and I am the Pillow author. - Consistently apply all of the above everywhere. --- LICENSE | 4 ++-- README.md | 4 ++-- docs/COPYING | 4 ++-- docs/conf.py | 8 ++++---- docs/index.rst | 2 +- pyproject.toml | 2 +- src/PIL/__init__.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/LICENSE b/LICENSE index 0069eb5bcec..7990a6e57dc 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,11 @@ The Python Imaging Library (PIL) is Copyright © 1997-2011 by Secret Labs AB - Copyright © 1995-2011 by Fredrik Lundh + Copyright © 1995-2011 by Fredrik Lundh and contributors Pillow is the friendly PIL fork. It is - Copyright © 2010-2024 by Jeffrey A. Clark (Alex) and contributors. + Copyright © 2010-2024 by Jeffrey A. Clark and contributors Like PIL, Pillow is licensed under the open source HPND License: diff --git a/README.md b/README.md index f142ef56302..823ea76d0c5 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ ## Python Imaging Library (Fork) -Pillow is the friendly PIL fork by [Jeffrey A. Clark (Alex) and +Pillow is the friendly PIL fork by [Jeffrey A. Clark and contributors](https://github.com/python-pillow/Pillow/graphs/contributors). -PIL is the Python Imaging Library by Fredrik Lundh and Contributors. +PIL is the Python Imaging Library by Fredrik Lundh and contributors. As of 2019, Pillow development is [supported by Tidelift](https://tidelift.com/subscription/pkg/pypi-pillow?utm_source=pypi-pillow&utm_medium=readme&utm_campaign=enterprise). diff --git a/docs/COPYING b/docs/COPYING index 73af6d99c0f..d5ee19f81a6 100644 --- a/docs/COPYING +++ b/docs/COPYING @@ -1,11 +1,11 @@ The Python Imaging Library (PIL) is Copyright © 1997-2011 by Secret Labs AB - Copyright © 1995-2011 by Fredrik Lundh + Copyright © 1995-2011 by Fredrik Lundh and contributors Pillow is the friendly PIL fork. It is - Copyright © 2010-2024 by Jeffrey A. Clark (Alex) and contributors + Copyright © 2010-2024 by Jeffrey A. Clark and contributors Like PIL, Pillow is licensed under the open source PIL Software License: diff --git a/docs/conf.py b/docs/conf.py index 97289c91d0c..ebb64680301 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -54,9 +54,9 @@ # General information about the project. project = "Pillow (PIL Fork)" copyright = ( - "1995-2011 Fredrik Lundh, 2010-2024 Jeffrey A. Clark (Alex) and contributors" + "1995-2011 Fredrik Lundh and contributors, 2010-2024 Jeffrey A. Clark and contributors." ) -author = "Fredrik Lundh, Jeffrey A. Clark (Alex), contributors" +author = "Fredrik Lundh (PIL), Jeffrey A. Clark (Pillow)" # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -252,7 +252,7 @@ master_doc, "PillowPILFork.tex", "Pillow (PIL Fork) Documentation", - "Jeffrey A. Clark (Alex)", + "Jeffrey A. Clark", "manual", ) ] @@ -302,7 +302,7 @@ "Pillow (PIL Fork) Documentation", author, "PillowPILFork", - "Pillow is the friendly PIL fork by Jeffrey A. Clark (Alex) and contributors.", + "Pillow is the friendly PIL fork by Jeffrey A. Clark and contributors.", "Miscellaneous", ) ] diff --git a/docs/index.rst b/docs/index.rst index 1ed9266eb8e..3a12953f08b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Pillow ====== -Pillow is the friendly PIL fork by `Jeffrey A. Clark (Alex) and contributors `_. PIL is the Python Imaging Library by Fredrik Lundh and contributors. +Pillow is the friendly PIL fork by `Jeffrey A. Clark and contributors `_. PIL is the Python Imaging Library by Fredrik Lundh and contributors. Pillow for enterprise is available via the Tidelift Subscription. `Learn more `_. diff --git a/pyproject.toml b/pyproject.toml index 518facc34f7..29b784db7d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ keywords = [ "Imaging", ] license = {text = "HPND"} -authors = [{name = "Jeffrey A. Clark (Alex)", email = "aclark@aclark.net"}] +authors = [{name = "Jeffrey A. Clark", email = "aclark@aclark.net"}] requires-python = ">=3.8" classifiers = [ "Development Status :: 6 - Mature", diff --git a/src/PIL/__init__.py b/src/PIL/__init__.py index 63a45769ba6..09546fe6333 100644 --- a/src/PIL/__init__.py +++ b/src/PIL/__init__.py @@ -1,6 +1,6 @@ """Pillow (Fork of the Python Imaging Library) -Pillow is the friendly PIL fork by Jeffrey A. Clark (Alex) and contributors. +Pillow is the friendly PIL fork by Jeffrey A. Clark and contributors. https://github.com/python-pillow/Pillow/ Pillow is forked from PIL 1.1.7. From 66ef6ad9ac65f528bdb7a9e6745bb93154f8b928 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 13:49:17 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- docs/conf.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index ebb64680301..1312cac6121 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,9 +53,7 @@ # General information about the project. project = "Pillow (PIL Fork)" -copyright = ( - "1995-2011 Fredrik Lundh and contributors, 2010-2024 Jeffrey A. Clark and contributors." -) +copyright = "1995-2011 Fredrik Lundh and contributors, 2010-2024 Jeffrey A. Clark and contributors." author = "Fredrik Lundh (PIL), Jeffrey A. Clark (Pillow)" # The version info for the project you're documenting, acts as replacement for From 567ee6bdaa5d9f9bf12d0445573d758ab505b11a Mon Sep 17 00:00:00 2001 From: "Jeffrey A. Clark" Date: Sat, 23 Mar 2024 17:50:41 -0400 Subject: [PATCH 3/3] Update docs/conf.py Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- docs/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 1312cac6121..882e076685c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -53,7 +53,10 @@ # General information about the project. project = "Pillow (PIL Fork)" -copyright = "1995-2011 Fredrik Lundh and contributors, 2010-2024 Jeffrey A. Clark and contributors." +copyright = ( + "1995-2011 Fredrik Lundh and contributors, " + "2010-2024 Jeffrey A. Clark and contributors." +) author = "Fredrik Lundh (PIL), Jeffrey A. Clark (Pillow)" # The version info for the project you're documenting, acts as replacement for