Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 587b305

Browse files
committed
Closes #19043: remove detailed listing of versions from license files
Since all versions since 2.2 are under the same licensing terms, this saves the release manager from touching the two files for very new minor release.
1 parent ce34687 commit 587b305

2 files changed

Lines changed: 2 additions & 110 deletions

File tree

Doc/license.rst

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -50,81 +50,11 @@ been GPL-compatible; the table below summarizes the various releases.
5050
+----------------+--------------+------------+------------+-----------------+
5151
| 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes |
5252
+----------------+--------------+------------+------------+-----------------+
53-
| 2.2 | 2.1.1 | 2001 | PSF | yes |
54-
+----------------+--------------+------------+------------+-----------------+
5553
| 2.1.2 | 2.1.1 | 2002 | PSF | yes |
5654
+----------------+--------------+------------+------------+-----------------+
5755
| 2.1.3 | 2.1.2 | 2002 | PSF | yes |
5856
+----------------+--------------+------------+------------+-----------------+
59-
| 2.2.1 | 2.2 | 2002 | PSF | yes |
60-
+----------------+--------------+------------+------------+-----------------+
61-
| 2.2.2 | 2.2.1 | 2002 | PSF | yes |
62-
+----------------+--------------+------------+------------+-----------------+
63-
| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes |
64-
+----------------+--------------+------------+------------+-----------------+
65-
| 2.3 | 2.2.2 | 2002-2003 | PSF | yes |
66-
+----------------+--------------+------------+------------+-----------------+
67-
| 2.3.1 | 2.3 | 2002-2003 | PSF | yes |
68-
+----------------+--------------+------------+------------+-----------------+
69-
| 2.3.2 | 2.3.1 | 2003 | PSF | yes |
70-
+----------------+--------------+------------+------------+-----------------+
71-
| 2.3.3 | 2.3.2 | 2003 | PSF | yes |
72-
+----------------+--------------+------------+------------+-----------------+
73-
| 2.3.4 | 2.3.3 | 2004 | PSF | yes |
74-
+----------------+--------------+------------+------------+-----------------+
75-
| 2.3.5 | 2.3.4 | 2005 | PSF | yes |
76-
+----------------+--------------+------------+------------+-----------------+
77-
| 2.4 | 2.3 | 2004 | PSF | yes |
78-
+----------------+--------------+------------+------------+-----------------+
79-
| 2.4.1 | 2.4 | 2005 | PSF | yes |
80-
+----------------+--------------+------------+------------+-----------------+
81-
| 2.4.2 | 2.4.1 | 2005 | PSF | yes |
82-
+----------------+--------------+------------+------------+-----------------+
83-
| 2.4.3 | 2.4.2 | 2006 | PSF | yes |
84-
+----------------+--------------+------------+------------+-----------------+
85-
| 2.4.4 | 2.4.3 | 2006 | PSF | yes |
86-
+----------------+--------------+------------+------------+-----------------+
87-
| 2.5 | 2.4 | 2006 | PSF | yes |
88-
+----------------+--------------+------------+------------+-----------------+
89-
| 2.5.1 | 2.5 | 2007 | PSF | yes |
90-
+----------------+--------------+------------+------------+-----------------+
91-
| 2.6 | 2.5 | 2008 | PSF | yes |
92-
+----------------+--------------+------------+------------+-----------------+
93-
| 2.6.1 | 2.6 | 2008 | PSF | yes |
94-
+----------------+--------------+------------+------------+-----------------+
95-
| 2.6.2 | 2.6.1 | 2009 | PSF | yes |
96-
+----------------+--------------+------------+------------+-----------------+
97-
| 2.6.3 | 2.6.2 | 2009 | PSF | yes |
98-
+----------------+--------------+------------+------------+-----------------+
99-
| 2.6.4 | 2.6.3 | 2009 | PSF | yes |
100-
+----------------+--------------+------------+------------+-----------------+
101-
| 3.0 | 2.6 | 2008 | PSF | yes |
102-
+----------------+--------------+------------+------------+-----------------+
103-
| 3.0.1 | 3.0 | 2009 | PSF | yes |
104-
+----------------+--------------+------------+------------+-----------------+
105-
| 3.1 | 3.0.1 | 2009 | PSF | yes |
106-
+----------------+--------------+------------+------------+-----------------+
107-
| 3.1.1 | 3.1 | 2009 | PSF | yes |
108-
+----------------+--------------+------------+------------+-----------------+
109-
| 3.1.2 | 3.1.1 | 2010 | PSF | yes |
110-
+----------------+--------------+------------+------------+-----------------+
111-
| 3.1.3 | 3.1.2 | 2010 | PSF | yes |
112-
+----------------+--------------+------------+------------+-----------------+
113-
| 3.1.4 | 3.1.3 | 2011 | PSF | yes |
114-
+----------------+--------------+------------+------------+-----------------+
115-
| 3.2 | 3.1 | 2011 | PSF | yes |
116-
+----------------+--------------+------------+------------+-----------------+
117-
| 3.2.1 | 3.2 | 2011 | PSF | yes |
118-
+----------------+--------------+------------+------------+-----------------+
119-
| 3.2.2 | 3.2.1 | 2011 | PSF | yes |
120-
+----------------+--------------+------------+------------+-----------------+
121-
| 3.2.3 | 3.2.2 | 2012 | PSF | yes |
122-
+----------------+--------------+------------+------------+-----------------+
123-
| 3.2.4 | 3.2.3 | 2013 | PSF | yes |
124-
+----------------+--------------+------------+------------+-----------------+
125-
| 3.3.0 | 3.2 | 2012 | PSF | yes |
126-
+----------------+--------------+------------+------------+-----------------+
127-
| 3.3.1 | 3.3.0 | 2013 | PSF | yes |
57+
| 2.2 and above | 2.1.1 | 2001-now | PSF | yes |
12858
+----------------+--------------+------------+------------+-----------------+
12959

13060
.. note::

LICENSE

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -36,47 +36,9 @@ the various releases.
3636
2.1 2.0+1.6.1 2001 PSF no
3737
2.0.1 2.0+1.6.1 2001 PSF yes
3838
2.1.1 2.1+2.0.1 2001 PSF yes
39-
2.2 2.1.1 2001 PSF yes
4039
2.1.2 2.1.1 2002 PSF yes
4140
2.1.3 2.1.2 2002 PSF yes
42-
2.2.1 2.2 2002 PSF yes
43-
2.2.2 2.2.1 2002 PSF yes
44-
2.2.3 2.2.2 2003 PSF yes
45-
2.3 2.2.2 2002-2003 PSF yes
46-
2.3.1 2.3 2002-2003 PSF yes
47-
2.3.2 2.3.1 2002-2003 PSF yes
48-
2.3.3 2.3.2 2002-2003 PSF yes
49-
2.3.4 2.3.3 2004 PSF yes
50-
2.3.5 2.3.4 2005 PSF yes
51-
2.4 2.3 2004 PSF yes
52-
2.4.1 2.4 2005 PSF yes
53-
2.4.2 2.4.1 2005 PSF yes
54-
2.4.3 2.4.2 2006 PSF yes
55-
2.4.4 2.4.3 2006 PSF yes
56-
2.5 2.4 2006 PSF yes
57-
2.5.1 2.5 2007 PSF yes
58-
2.5.2 2.5.1 2008 PSF yes
59-
2.5.3 2.5.2 2008 PSF yes
60-
2.6 2.5 2008 PSF yes
61-
2.6.1 2.6 2008 PSF yes
62-
2.6.2 2.6.1 2009 PSF yes
63-
2.6.3 2.6.2 2009 PSF yes
64-
2.6.4 2.6.3 2009 PSF yes
65-
2.6.5 2.6.4 2010 PSF yes
66-
3.0 2.6 2008 PSF yes
67-
3.0.1 3.0 2009 PSF yes
68-
3.1 3.0.1 2009 PSF yes
69-
3.1.1 3.1 2009 PSF yes
70-
3.1.2 3.1.1 2010 PSF yes
71-
3.1.3 3.1.2 2010 PSF yes
72-
3.1.4 3.1.3 2011 PSF yes
73-
3.2 3.1 2011 PSF yes
74-
3.2.1 3.2 2011 PSF yes
75-
3.2.2 3.2.1 2011 PSF yes
76-
3.2.3 3.2.2 2012 PSF yes
77-
3.2.4 3.2.3 2013 PSF yes
78-
3.3.0 3.2 2012 PSF yes
79-
3.3.1 3.3.0 2013 PSF yes
41+
2.2 and above 2.1.1 2001-now PSF yes
8042

8143
Footnotes:
8244

0 commit comments

Comments
 (0)