Skip to content

Commit 3f94cc9

Browse files
authored
Merge pull request #6392 from hugovk/4.6-maintenance-2020
4.6: Update copyright year to 2020
2 parents 621028c + 897f1a3 commit 3f94cc9

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2004-2019 Holger Krekel and others
3+
Copyright (c) 2004-2020 Holger Krekel and others
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Tidelift will coordinate the fix and disclosure.
131131
License
132132
-------
133133

134-
Copyright Holger Krekel and others, 2004-2019.
134+
Copyright Holger Krekel and others, 2004-2020.
135135

136136
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
137137

doc/en/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
# General information about the project.
6666
project = u"pytest"
6767
year = datetime.datetime.utcnow().year
68-
copyright = u"2015–2019 , holger krekel and pytest-dev team"
68+
copyright = u"2015–2020, holger krekel and pytest-dev team"
6969

7070

7171
# The language for content autogenerated by Sphinx. Refer to documentation
@@ -275,7 +275,7 @@
275275
epub_title = u"pytest"
276276
epub_author = u"holger krekel at merlinux eu"
277277
epub_publisher = u"holger krekel at merlinux eu"
278-
epub_copyright = u"2013, holger krekel et alii"
278+
epub_copyright = u"2013-2020, holger krekel et alii"
279279

280280
# The language of the text. It defaults to the language option
281281
# or en if the language is not set.

doc/en/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Consult the :ref:`Changelog <changelog>` page for fixes and enhancements of each
8787
License
8888
-------
8989

90-
Copyright Holger Krekel and others, 2004-2017.
90+
Copyright Holger Krekel and others, 2004-2020.
9191

9292
Distributed under the terms of the `MIT`_ license, pytest is free and open source software.
9393

doc/en/license.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Distributed under the terms of the `MIT`_ license, pytest is free and open sourc
99
1010
The MIT License (MIT)
1111
12-
Copyright (c) 2004-2017 Holger Krekel and others
12+
Copyright (c) 2004-2020 Holger Krekel and others
1313
1414
Permission is hereby granted, free of charge, to any person obtaining a copy of
1515
this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)