From f1180a257195abd895615f1c1426e61bde06f5b3 Mon Sep 17 00:00:00 2001 From: iswbm Date: Wed, 29 Sep 2021 14:28:12 +0800 Subject: [PATCH 1/6] update --- source/c02/c02_04.rst | 3 ++- source/c08/c08_03.md | 3 ++- source/c08/c08_03.rst | 3 ++- source/c08/c08_16.md | 2 -- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/c02/c02_04.rst b/source/c02/c02_04.rst index 38e5da5..408c43a 100755 --- a/source/c02/c02_04.rst +++ b/source/c02/c02_04.rst @@ -339,7 +339,8 @@ Queue.task_done()，说明队列这个任务已经结束了。 当队列内部的任务计数器归于零时，调用 Queue.join() 就不会再阻塞了。 -要理解这个过程，请参考 http://pythontime.iswbm.com/en/latest/c02/c02_06.html +要理解这个过程，请参考 +http://pythontime.iswbm.com/en/latest/c02/c02_06.html 里自定义线程池的的例子。 4. 消息队列的先进先出 diff --git a/source/c08/c08_03.md b/source/c08/c08_03.md index 18a1d18..ef1e329 100644 --- a/source/c08/c08_03.md +++ b/source/c08/c08_03.md @@ -87,7 +87,8 @@ virt-install --name ubuntu-16.04 \ - listen='0.0.0.0'> + + diff --git a/source/c08/c08_03.rst b/source/c08/c08_03.rst index 758198f..f456eb5 100755 --- a/source/c08/c08_03.rst +++ b/source/c08/c08_03.rst @@ -99,7 +99,8 @@ - listen='0.0.0.0'> + + diff --git a/source/c08/c08_16.md b/source/c08/c08_16.md index ad70dbe..eb9283b 100644 --- a/source/c08/c08_16.md +++ b/source/c08/c08_16.md @@ -246,8 +246,6 @@ $ nova meta b1575f81-0a33-4872-995e-2c2dd48d52c8 set __system__vif_inbound_avera $ nova meta b1575f81-0a33-4872-995e-2c2dd48d52c8 set __system__vif_inbound_average=12500 __system__vif_inbound_burst=10000 __system__vif_outbound_average=12500 __system__vif_outbound_burst=10000 ``` - - ## 3. 带宽单位换算 带宽，英文名 Bandwidth，在不同领域的含义各不相同，而在网络服务中，带宽是指单位时间内的流经数据量。 From 22a61b65d7d9f10304731e6c55afa701959662f6 Mon Sep 17 00:00:00 2001 From: iswbm Date: Sat, 11 Dec 2021 20:43:39 +0800 Subject: [PATCH 2/6] update --- source/.DS_Store | Bin 12292 -> 0 bytes source/aboutme.rst | 0 source/c01/c01_01.rst | 0 source/c01/c01_02.rst | 0 source/c01/c01_03.rst | 0 source/c01/c01_04.rst | 0 source/c01/c01_05.rst | 0 source/c01/c01_06.rst | 0 source/c01/c01_07.rst | 0 source/c01/c01_08.rst | 0 source/c01/c01_09.rst | 0 source/c01/c01_10.rst | 0 source/c01/c01_11.rst | 0 source/c01/c01_12.rst | 0 source/c01/c01_13.rst | 0 source/c02/c02_01.rst | 0 source/c02/c02_02.rst | 0 source/c02/c02_03.rst | 0 source/c02/c02_04.rst | 0 source/c02/c02_05.rst | 0 source/c02/c02_06.rst | 0 source/c02/c02_07.rst | 0 source/c02/c02_08.rst | 0 source/c02/c02_09.rst | 0 source/c02/c02_10.rst | 0 source/c02/c02_11.rst | 0 source/c03/c03_01.rst | 0 source/c03/c03_02.rst | 0 source/c03/c03_03.rst | 0 source/c03/c03_04.rst | 0 source/c04/c04_01.rst | 0 source/c04/c04_02.rst | 0 source/c04/c04_03.rst | 0 source/c04/c04_04.rst | 0 source/c04/c04_05.rst | 0 source/c04/c04_06.rst | 0 source/c04/c04_07.rst | 0 source/c04/c04_08.rst | 0 source/c04/c04_09.rst | 0 source/c04/c04_10.rst | 0 source/c05/c05_01.rst | 0 source/c05/c05_02.rst | 0 source/c05/c05_03.rst | 0 source/c06/c06_01.rst | 0 source/c06/c06_02.rst | 0 source/c06/c06_03.rst | 0 source/c06/c06_04.rst | 0 source/c06/c06_05.rst | 0 source/c06/c06_06.rst | 0 source/c07/c07_01.rst | 0 source/c07/c07_02.rst | 0 source/c07/c07_03.rst | 0 source/c07/c07_04.rst | 0 source/c07/c07_05.rst | 0 source/c07/c07_06.rst | 0 source/c07/c07_07.rst | 0 source/c08/c08_01.rst | 0 source/c08/c08_02.rst | 0 source/c08/c08_03.rst | 0 source/chapters/p01.rst | 0 source/chapters/p02.rst | 0 source/chapters/p03.rst | 0 source/chapters/p04.rst | 0 source/chapters/p05.rst | 0 source/chapters/p06.rst | 0 source/chapters/p07.rst | 0 source/chapters/p08.rst | 0 source/chapters/p10.rst | 0 source/conf.py | 0 source/index.rst | 0 source/lc01/1-10.rst | 0 source/leetcode/leetcode.rst | 0 source/preface.rst | 0 source/roadmap.rst | 0 74 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 source/.DS_Store mode change 100755 => 100644 source/aboutme.rst mode change 100755 => 100644 source/c01/c01_01.rst mode change 100755 => 100644 source/c01/c01_02.rst mode change 100755 => 100644 source/c01/c01_03.rst mode change 100755 => 100644 source/c01/c01_04.rst mode change 100755 => 100644 source/c01/c01_05.rst mode change 100755 => 100644 source/c01/c01_06.rst mode change 100755 => 100644 source/c01/c01_07.rst mode change 100755 => 100644 source/c01/c01_08.rst mode change 100755 => 100644 source/c01/c01_09.rst mode change 100755 => 100644 source/c01/c01_10.rst mode change 100755 => 100644 source/c01/c01_11.rst mode change 100755 => 100644 source/c01/c01_12.rst mode change 100755 => 100644 source/c01/c01_13.rst mode change 100755 => 100644 source/c02/c02_01.rst mode change 100755 => 100644 source/c02/c02_02.rst mode change 100755 => 100644 source/c02/c02_03.rst mode change 100755 => 100644 source/c02/c02_04.rst mode change 100755 => 100644 source/c02/c02_05.rst mode change 100755 => 100644 source/c02/c02_06.rst mode change 100755 => 100644 source/c02/c02_07.rst mode change 100755 => 100644 source/c02/c02_08.rst mode change 100755 => 100644 source/c02/c02_09.rst mode change 100755 => 100644 source/c02/c02_10.rst mode change 100755 => 100644 source/c02/c02_11.rst mode change 100755 => 100644 source/c03/c03_01.rst mode change 100755 => 100644 source/c03/c03_02.rst mode change 100755 => 100644 source/c03/c03_03.rst mode change 100755 => 100644 source/c03/c03_04.rst mode change 100755 => 100644 source/c04/c04_01.rst mode change 100755 => 100644 source/c04/c04_02.rst mode change 100755 => 100644 source/c04/c04_03.rst mode change 100755 => 100644 source/c04/c04_04.rst mode change 100755 => 100644 source/c04/c04_05.rst mode change 100755 => 100644 source/c04/c04_06.rst mode change 100755 => 100644 source/c04/c04_07.rst mode change 100755 => 100644 source/c04/c04_08.rst mode change 100755 => 100644 source/c04/c04_09.rst mode change 100755 => 100644 source/c04/c04_10.rst mode change 100755 => 100644 source/c05/c05_01.rst mode change 100755 => 100644 source/c05/c05_02.rst mode change 100755 => 100644 source/c05/c05_03.rst mode change 100755 => 100644 source/c06/c06_01.rst mode change 100755 => 100644 source/c06/c06_02.rst mode change 100755 => 100644 source/c06/c06_03.rst mode change 100755 => 100644 source/c06/c06_04.rst mode change 100755 => 100644 source/c06/c06_05.rst mode change 100755 => 100644 source/c06/c06_06.rst mode change 100755 => 100644 source/c07/c07_01.rst mode change 100755 => 100644 source/c07/c07_02.rst mode change 100755 => 100644 source/c07/c07_03.rst mode change 100755 => 100644 source/c07/c07_04.rst mode change 100755 => 100644 source/c07/c07_05.rst mode change 100755 => 100644 source/c07/c07_06.rst mode change 100755 => 100644 source/c07/c07_07.rst mode change 100755 => 100644 source/c08/c08_01.rst mode change 100755 => 100644 source/c08/c08_02.rst mode change 100755 => 100644 source/c08/c08_03.rst mode change 100755 => 100644 source/chapters/p01.rst mode change 100755 => 100644 source/chapters/p02.rst mode change 100755 => 100644 source/chapters/p03.rst mode change 100755 => 100644 source/chapters/p04.rst mode change 100755 => 100644 source/chapters/p05.rst mode change 100755 => 100644 source/chapters/p06.rst mode change 100755 => 100644 source/chapters/p07.rst mode change 100755 => 100644 source/chapters/p08.rst mode change 100755 => 100644 source/chapters/p10.rst mode change 100755 => 100644 source/conf.py mode change 100755 => 100644 source/index.rst mode change 100755 => 100644 source/lc01/1-10.rst mode change 100755 => 100644 source/leetcode/leetcode.rst mode change 100755 => 100644 source/preface.rst mode change 100755 => 100644 source/roadmap.rst diff --git a/source/.DS_Store b/source/.DS_Store deleted file mode 100644 index 30e178227a51cc5fee5acff79a4774f68ec2d071..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeHNYj7J^6+Xvy;@x!~Yvah0VkK%EH;yYOwk1ban;7{SyJ<+kPVA&<6g}3l23c~o zlAXk);}Qa8rY)~RN&_9B%rG;+Ao+w*<*+ywv}$i}(=+5kYJjpgbZDy9>69i0>qE4~?*U(lCQRpn`|6`H4L|o5wcK#Bps%uuQu9YN3 zQr0TBjnAYO#xvneRv!qbZ)Il(!5 zZFp14MN>4U7$}-kxtp0&9yIbLk&EVlqB)>(Wj1kP3HjA2chd(;AEgVH!TAJ^lNgm!2l9?Q%e3F}cU z8H*=R9;I1yG83PUYiYS2L-Is2JgZ$%*R5Y`YqHy?vXS`h*?8u(+9FB3bYrt!IToW! z?oY*7tC;$TB=Z_~v)z6xs~Jpdw2v7Lwzk@p37z#UY#45DSCol&(sW+cWzlrUPQ`vG z5sqjHH71Meczud}a$by>y3Z)=4Jh`hXlizrx~$iu$0**@XSW|`SH2~zXAaD1N$S<( z#^nd7S4UV~e=NrOB(((F#FLdcBs>K_g=VD?9X*xw0WwOG&LwGo?f6K*4jwc`!gfxFO;0fN~e4iU`u;z4{nj^hL# z#*hIu4U?F{+cAw9Jd1bW65fgD@NT>pKZGA9=-r2(#0Lec@?aY^P-bNKxdPbc$J5C~ zDtVGh7&HY0ePfAK)CglTJ#iCl_rJmu9p$a2V|p|~;l4sqkE!A3sj9r;u2L&(s%Yge z|NGwZqCio^^~v1ZQixcRcUUX^?<1BnOCi;{xY*_G@_F1HJZ9O|?c3#Xclo-?qn0cj zNom=rsxsD^FsarZ#PM$R+M3Phc&Z9gbq(Lkz+knB3-Q zXP$t&B2m&IlW)*v?vZ$jqg&?gL3k=rI%%Ndy+)1lEr?8x%H<$M81pTc*jY%#l~oIfb3ayYT(w zPc9OLF#`J{K8oML@8b9H`}kx089vA13waN-U!3Rm_Pc4gSs+R0i^tMftgq(xZChM0>)-o+7B_T%te2VPp z-yu`lg7GIxMf_O<3BKIcWwIl>EU}ZwPNQFj_lK@fYR`zX#J-Mtn6?=np zx29HUy4x__!7Lx6%B|?GOInGCVePFE_`eYv2x2 zl)WS(4MFK+>)~CUJ>`P(0r3=;6_iYHn(mX-dm<;_O;tq#vtlU3Hd6n(35C=*C`wVt zV>y!LBo)g5uKu>R+KNIUOk0+QLRblf zLTp8$5LQH?5L-?~a)M@s6biBB^+zETV(YU7+5Fa|NciOknr*hqN^*svkT1a_@GVl1 zPr*-!%~>eqIb!q|cqrsWcnMzSp^!RUbCscx^TgqIT}3FQ9FI8-X@x}02rmtZFx9x( z?R2UPGm=nxTb&A@60y3rtyEVtwhY^!82&MrQrQIe?%d~j; z(0EN&OoQjGu4?{If3S)+N^ML73@`uvA2+gg)(BW5@WvbgtQi^~8lZd2EzX#4ldZM8 zX*)q1OU!PG9Z;fUz7$V6Uy7%kFU3=yTZ>{gLBn=Q Date: Wed, 19 Jun 2024 21:51:01 +0800 Subject: [PATCH 3/6] update requirements.txt to python3.10.12 --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2058b9e..08d22be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,22 +1,21 @@ alabaster==0.7.12 argh==0.26.2 -Babel==2.7.0 +Babel==2.9.1 certifi==2019.6.16 chardet==3.0.4 docutils==0.14 -idna==2.8 imagesize==1.1.0 -Jinja2==2.10.1 +Jinja2==2.11.3 livereload==2.6.1 MarkupSafe==1.1.1 packaging==19.0 pathtools==0.1.2 port-for==0.3.1 -Pygments==2.4.2 +Pygments==2.7.4 pyparsing==2.4.0 pytz==2019.1 -PyYAML==5.1.1 -requests==2.22.0 +PyYAML==6.0.1 +requests==2.32.3 six==1.12.0 snowballstemmer==1.9.0 Sphinx==2.1.2 @@ -29,7 +28,7 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.2 sphinxcontrib-serializinghtml==1.1.3 tornado==6.0.3 -urllib3==1.25.3 +urllib3==2.2.2 watchdog==0.9.0 sphinxcontrib-disqus==1.1.0 sphinxcontrib-applehelp==1.0.1 @@ -39,3 +38,4 @@ sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.2 sphinxcontrib-serializinghtml==1.1.3 sphinx-sitemap==2.2.0 +sphinx-multiversion==0.2.4 From 3ad7885224e45768e06a8d6f5ec34f71710ac374 Mon Sep 17 00:00:00 2001 From: iswbm Date: Wed, 19 Jun 2024 22:26:03 +0800 Subject: [PATCH 4/6] support sphinx-multiversion --- rebuild.sh | 13 +++++++++++++ source/_templates/versions.html | 27 +++++++++++++++++++++++++++ source/conf.py | 27 ++++++++++++--------------- 3 files changed, 52 insertions(+), 15 deletions(-) create mode 100755 rebuild.sh create mode 100644 source/_templates/versions.html diff --git a/rebuild.sh b/rebuild.sh new file mode 100755 index 0000000..3ceedd8 --- /dev/null +++ b/rebuild.sh @@ -0,0 +1,13 @@ +cat << EOF >/usr/local/lib/python3.10/site-packages/sphinx_rtd_theme/comments.html + + + +EOF + +rm -rf build/ && sphinx-multiversion source build/html && cp -rf build/html/master/* build/html/ diff --git a/source/_templates/versions.html b/source/_templates/versions.html new file mode 100644 index 0000000..31a1257 --- /dev/null +++ b/source/_templates/versions.html @@ -0,0 +1,27 @@ +{%- if current_version %} +
+ + Other Versions + v: {{ current_version.name }} + + +
+ {%- if versions.tags %} +
+
Tags
+ {%- for item in versions.tags %} +
{{ item.name }}
+ {%- endfor %} +
+ {%- endif %} + {%- if versions.branches %} +
+
Branches
+ {%- for item in versions.branches %} +
{{ item.name }}
+ {%- endfor %} +
+ {%- endif %} +
+
+{%- endif %} diff --git a/source/conf.py b/source/conf.py index fdcb6f7..66e5159 100644 --- a/source/conf.py +++ b/source/conf.py @@ -28,7 +28,7 @@ # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. -extensions = ['chinese_search','sphinx.ext.mathjax', 'sphinx_sitemap'] +extensions = ['chinese_search','sphinx.ext.mathjax', 'sphinx_sitemap', 'sphinx_multiversion'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -127,28 +127,25 @@ sys.path.append(os.path.abspath(_exts)) html_js_files = [ - 'js/readmore.js', + 'js/readmore.js', 'js/baidutongji.js', ] -# General configuration. -with open("/home/docs/checkouts/readthedocs.org/user_builds/pythoncodingtime/envs/latest/lib/python3.7/site-packages/sphinxcontrib/disqus.py", "r") as file: - content = file.read() - content=content.replace("sphinx.application", "sphinx.errors") - -with open("/home/docs/checkouts/readthedocs.org/user_builds/pythoncodingtime/envs/latest/lib/python3.7/site-packages/sphinxcontrib/disqus.py", "w") as file: - file.write(content) author = '王炳明' -copyright = '2020, Python编程时光' +copyright = '2020-2024, Python编程时光' exclude_patterns = ['_build'] -extensions = ['sphinxcontrib.disqus'] # Add to this list. master_doc = 'index' project = 'Python编程时光' -release = '1.0' -version = '1.0' # Options for extensions. -disqus_shortname = 'iswbm' # Add this line to conf.py. -html_baseurl = 'http://pythontime.iswbm.com' +html_baseurl = 'https://magic.iswbm.com' html_extra_path = ["robots.txt"] + +html_sidebars = { + '**': [ + 'versioning.html', + ], +} +smv_latest_version = 'master' +sitemap_url_scheme = "{link}" From 07ecd0ea6bc99c5d821c28fc560f551c0848d711 Mon Sep 17 00:00:00 2001 From: iswbm Date: Mon, 26 Jan 2026 22:12:53 +0800 Subject: [PATCH 5/6] update requirements.txt to python3.6.8 --- rebuild.sh | 2 +- requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rebuild.sh b/rebuild.sh index 3ceedd8..319b303 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1,4 +1,4 @@ -cat << EOF >/usr/local/lib/python3.10/site-packages/sphinx_rtd_theme/comments.html +cat << EOF >/usr/local/lib/python3.6/site-packages/sphinx_rtd_theme/comments.html