From dca7ffd17b6a789c2e2a84e7bc854e3548e6d437 Mon Sep 17 00:00:00 2001 From: Jed Fox Date: Thu, 9 Jan 2020 12:15:25 -0500 Subject: [PATCH] Update versions & dates for Python, extract info for downloading --- .../templates/pages/about_tmpl.coffee | 2 +- docs/file-scrapers.md | 18 ++++++++++++++++++ lib/docs/scrapers/python.rb | 16 +++++----------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/assets/javascripts/templates/pages/about_tmpl.coffee b/assets/javascripts/templates/pages/about_tmpl.coffee index 7b7272cc..7854d5ed 100644 --- a/assets/javascripts/templates/pages/about_tmpl.coffee +++ b/assets/javascripts/templates/pages/about_tmpl.coffee @@ -613,7 +613,7 @@ credits = [ 'https://raw.githubusercontent.com/pygame/pygame/master/LICENSE' ], [ 'Python', - '2001-2019 Python Software Foundation
Python is a trademark of the Python Software Foundation.', + '2001-2020 Python Software Foundation
Python is a trademark of the Python Software Foundation.', 'PSFL', 'https://docs.python.org/3/license.html' ], [ diff --git a/docs/file-scrapers.md b/docs/file-scrapers.md index 14d23da4..1895f276 100644 --- a/docs/file-scrapers.md +++ b/docs/file-scrapers.md @@ -44,6 +44,24 @@ Go to https://www.erlang.org/downloads and download the HTML documentation file. ## Python +### Versions 3.6+ + +```sh +mkdir docs/python~$VERSION +cd docs/python~$VERSION +curl -L https://docs.python.org/$VERSION/archives/python-$RELEASE-docs-html.tar.bz2 | \ +tar xj --strip-components=1 +``` + +### < 3.6 + +```sh +mkdir docs/python~$VERSION +cd docs/python~$VERSION +curl -L https://docs.python.org/ftp/python/doc/$RELEASE/python-$RELEASE-docs-html.tar.bz2 | \ +tar xj --strip-components=1 +``` + ## RDoc ### Nokogiri diff --git a/lib/docs/scrapers/python.rb b/lib/docs/scrapers/python.rb index a9c99cd7..89f1c3c0 100644 --- a/lib/docs/scrapers/python.rb +++ b/lib/docs/scrapers/python.rb @@ -19,32 +19,26 @@ module Docs library/sunau.html) options[:attribution] = <<-HTML - © 2001–2019 Python Software Foundation
+ © 2001–2020 Python Software Foundation
Licensed under the PSF License. HTML - # In order to download the documentation, run: - # $ mkdir -p docs/python~3.8 && \ - # cd docs/python~3.8 && \ - # curl -L https://docs.python.org/3.8/archives/python-3.8.0-docs-html.tar.bz2 | \ - # tar xj --strip-components=1 - version '3.8' do # docs.python.org/3.8/download.html - self.release = '3.8.0' + self.release = '3.8.1' self.base_url = 'https://docs.python.org/3.8/' html_filters.push 'python/entries_v3', 'sphinx/clean_html', 'python/clean_html' end version '3.7' do # docs.python.org/3.7/download.html - self.release = '3.7.5' + self.release = '3.7.6' self.base_url = 'https://docs.python.org/3.7/' html_filters.push 'python/entries_v3', 'sphinx/clean_html', 'python/clean_html' end version '3.6' do # docs.python.org/3.6/download.html - self.release = '3.6.9' + self.release = '3.6.10' self.base_url = 'https://docs.python.org/3.6/' html_filters.push 'python/entries_v3', 'sphinx/clean_html', 'python/clean_html' @@ -58,7 +52,7 @@ module Docs end version '2.7' do # docs.python.org/2.7/download.html - self.release = '2.7.16' + self.release = '2.7.17' self.base_url = 'https://docs.python.org/2.7/' html_filters.push 'python/entries_v2', 'sphinx/clean_html', 'python/clean_html'