Commit 31abfdda6527 (docs: Deprecate use of Sphinx < 2.4.x) in 6.2 added a warning that support for older versions of Sphinx would be going away. There have been no complaints, so the time has come. Raise the minimum Sphinx version to 2.4.4 and clean out some compatibility code that we no longer need.
Showing the changes to scripts (1 of 7 files). Show all
Unified · Split
| @@ -32,8 +32,7 @@ my $python_cmd = ""; · 31 unmodified lines | |||
| 32 | my $activate_cmd; | 32 | my $activate_cmd; |
| 33 | my $min_version; | 33 | my $min_version; |
| 34 | my $cur_version; | 34 | my $cur_version; |
| 35 | my $rec_version = "1.7.9"; # PDF won't build here | 35 | my $rec_version = "3.4.3"; |
| 36 | my $min_pdf_version = "2.4.4"; # Min version where pdf builds | ||
| 37 | my $latest_avail_ver; | 36 | my $latest_avail_ver; |
| 38 | 37 | ||
| 39 | # | 38 | # |
| @@ -791,9 +790,6 @@ sub recommend_sphinx_version($) · 751 unmodified lines | |||
| 791 | 790 | ||
| 792 | # Version is OK. Nothing to do. | 791 | # Version is OK. Nothing to do. |
| 793 | if ($cur_version && ($cur_version ge $rec_version)) { | 792 | if ($cur_version && ($cur_version ge $rec_version)) { |
| 794 | if ($cur_version lt $min_pdf_version) { | ||
| 795 | print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n"; | ||
| 796 | } | ||
| 797 | return; | 793 | return; |
| 798 | }; | 794 | }; |
| 799 | 795 | ||
| @@ -842,10 +838,6 @@ sub recommend_sphinx_version($) · 42 unmodified lines | |||
| 842 | printf "\t. $activate_cmd\n"; | 838 | printf "\t. $activate_cmd\n"; |
| 843 | deactivate_help(); | 839 | deactivate_help(); |
| 844 | 840 | ||
| 845 | if ($latest_avail_ver lt $min_pdf_version) { | ||
| 846 | print "note: If you want pdf, you need at least Sphinx $min_pdf_version.\n"; | ||
| 847 | } | ||
| 848 | |||
| 849 | return; | 841 | return; |
| 850 | } | 842 | } |
| 851 | 843 | ||