p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8649 from Saiprasad16/main 

UPDATE LICENSE
This commit is contained in:
Ran Benita 2021-05-13 17:34:18 +03:00 committed by GitHub
parent c5de274136 0d6e3b7005
commit 364bbe42fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -273,6 +273,7 @@ Ross Lawley
Ruaridh Williamson Ruaridh Williamson
Russel Winder Russel Winder
Ryan Wooden Ryan Wooden
Saiprasad Kale
Samuel Dion-Girardeau Samuel Dion-Girardeau
Samuel Searles-Bryant Samuel Searles-Bryant
Samuele Pedroni Samuele Pedroni

2
LICENSE
View File

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2004-2020 Holger Krekel and others Copyright (c) 2004-2021 Holger Krekel and others
Permission is hereby granted, free of charge, to any person obtaining a copy of 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 this software and associated documentation files (the "Software"), to deal in

4
doc/en/conf.py
View File

@ -71,7 +71,7 @@ master_doc = "contents"
# General information about the project. # General information about the project.
project = "pytest" project = "pytest"
copyright = "2015–2020, holger krekel and pytest-dev team" copyright = "2015–2021, holger krekel and pytest-dev team"
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
@ -293,7 +293,7 @@ man_pages = [("usage", "pytest", "pytest usage", ["holger krekel at merlinux eu"
epub_title = "pytest" epub_title = "pytest"
epub_author = "holger krekel at merlinux eu" epub_author = "holger krekel at merlinux eu"
epub_publisher = "holger krekel at merlinux eu" epub_publisher = "holger krekel at merlinux eu"
epub_copyright = "2013-2020, holger krekel et alii" epub_copyright = "2013-2021, holger krekel et alii"
# The language of the text. It defaults to the language option # The language of the text. It defaults to the language option
# or en if the language is not set. # or en if the language is not set.

2
doc/en/license.rst
View File

@ -9,7 +9,7 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2004-2020 Holger Krekel and others Copyright (c) 2004-2021 Holger Krekel and others
Permission is hereby granted, free of charge, to any person obtaining a copy of 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 this software and associated documentation files (the "Software"), to deal in