From deb4287d1c3c7980a065e975dbfdeeb7b5fcb7b6 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 4 Jan 2020 07:21:11 -0300 Subject: [PATCH] Update copyright year to 2020 Merge pull request #6392 from hugovk/4.6-maintenance-2020 --- LICENSE | 2 +- README.rst | 2 +- doc/en/conf.py | 4 ++-- doc/en/index.rst | 2 +- doc/en/license.rst | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 477af2d2e..d14fb7ff4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2004-2019 Holger Krekel and others +Copyright (c) 2004-2020 Holger Krekel and others Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.rst b/README.rst index 15ab4f0bc..36f26d14e 100644 --- a/README.rst +++ b/README.rst @@ -145,7 +145,7 @@ Tidelift will coordinate the fix and disclosure. License ------- -Copyright Holger Krekel and others, 2004-2019. +Copyright Holger Krekel and others, 2004-2020. Distributed under the terms of the `MIT`_ license, pytest is free and open source software. diff --git a/doc/en/conf.py b/doc/en/conf.py index 7e8a2f209..3fb6002bc 100644 --- a/doc/en/conf.py +++ b/doc/en/conf.py @@ -66,7 +66,7 @@ master_doc = "contents" # General information about the project. project = "pytest" -copyright = "2015–2019, holger krekel and pytest-dev team" +copyright = "2015–2020, holger krekel and pytest-dev team" # The language for content autogenerated by Sphinx. Refer to documentation @@ -289,7 +289,7 @@ man_pages = [("usage", "pytest", "pytest usage", ["holger krekel at merlinux eu" epub_title = "pytest" epub_author = "holger krekel at merlinux eu" epub_publisher = "holger krekel at merlinux eu" -epub_copyright = "2013, holger krekel et alii" +epub_copyright = "2013-2020, holger krekel et alii" # The language of the text. It defaults to the language option # or en if the language is not set. diff --git a/doc/en/index.rst b/doc/en/index.rst index d84bcd06d..806c498c7 100644 --- a/doc/en/index.rst +++ b/doc/en/index.rst @@ -120,7 +120,7 @@ Tidelift will coordinate the fix and disclosure. License ------- -Copyright Holger Krekel and others, 2004-2017. +Copyright Holger Krekel and others, 2004-2020. Distributed under the terms of the `MIT`_ license, pytest is free and open source software. diff --git a/doc/en/license.rst b/doc/en/license.rst index d94b34a99..c6c10bbf3 100644 --- a/doc/en/license.rst +++ b/doc/en/license.rst @@ -9,7 +9,7 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc The MIT License (MIT) - Copyright (c) 2004-2019 Holger Krekel and others + Copyright (c) 2004-2020 Holger Krekel and others Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in