Skip to content

Commit adc735d

Browse files
authored
Merge branch 'main' into fix-broken-link
2 parents 7f3e3b0 + db53c8f commit adc735d

11 files changed

Lines changed: 53 additions & 48 deletions

locales/zh_Hans/LC_MESSAGES/messages.po

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@
66
# bluewindde <13548563428@139.com>, 2021.
77
# Cube Kassaki <2524737581@qq.com>, 2021.
88
# xlivevil <xlivevil@163.com>, 2021.
9+
# Eric <spice2wolf@gmail.com>, 2021.
910
msgid ""
1011
msgstr ""
1112
"Project-Id-Version: Python Packaging User Guide\n"
1213
"Report-Msgid-Bugs-To: \n"
1314
"POT-Creation-Date: 2021-07-06 19:32+0800\n"
14-
"PO-Revision-Date: 2021-09-05 14:34+0000\n"
15-
"Last-Translator: meowmeowmeowcat <meowmeowcat1211@gmail.com>\n"
15+
"PO-Revision-Date: 2021-09-13 10:46+0000\n"
16+
"Last-Translator: Zuorong Zhang <zuorong-zhang@outlook.com>\n"
1617
"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
1718
"pypa/packaging-python-org/zh_Hans/>\n"
1819
"Language: zh_Hans\n"
1920
"MIME-Version: 1.0\n"
2021
"Content-Type: text/plain; charset=UTF-8\n"
2122
"Content-Transfer-Encoding: 8bit\n"
2223
"Plural-Forms: nplurals=1; plural=0;\n"
23-
"X-Generator: Weblate 4.8.1-dev\n"
24+
"X-Generator: Weblate 4.9-dev\n"
2425

2526
#: ../source/contribute.rst:5
2627
msgid "Contribute to this guide"
@@ -162,7 +163,7 @@ msgid ""
162163
"Python 3.6 on your operating system."
163164
msgstr ""
164165
"Python 3.6。我们的构建脚本只为 Python 3.6 而设计。请参阅 `Hitchhiker's Guide to Python "
165-
"installation instructions`_ 以在你您的操作系统上安装Python 3.6。"
166+
"installation instructions`_ 将 Python 3.6 安装于您的操作系统中。"
166167

167168
#: ../source/contribute.rst:91
168169
msgid ""
@@ -656,8 +657,9 @@ msgid ""
656657
"what index or source). The where (i.e. how they are to be made \"Concrete"
657658
"\") is to be determined at install time using :ref:`pip` options. [1]_"
658659
msgstr ""
659-
"最后,重要的是要了解“install_requires”是“Abstract”要求的列表,即只是名称和版本限制,并不能确定从哪里满足依赖关系(即从什么索引"
660-
"或来源)。在安装时使用 :ref:`pip` 选项确定在哪里(即如何使它们“Concrete”)。 [1]_"
660+
"最后,重要的是要了解 ``install_requires`` "
661+
"是“Abstract”要求的列表,即只是名称和版本限制,并不能确定从哪里满足依赖关系(即从什么索引或来源)。在安装时使用 :ref:`pip` "
662+
"选项确定在哪里(即如何使它们“Concrete”)。 [1]_"
661663

662664
#: ../source/discussions/install-requires-vs-requirements.rst:64
663665
#: ../source/tutorials/installing-packages.rst:460
@@ -699,8 +701,8 @@ msgid ""
699701
"\"Concrete\", i.e. associated with a particular index or directory of "
700702
"packages. [1]_"
701703
msgstr ""
702-
"而install_requires需求是“Abstract”,即不与任何特定索引相关联,需求文件通常包含诸如“--index-url”或"
703-
"“--find-links”之类的pip选项来提出需求“Concrete”,即与包的特定索引或目录相关联。 [1]_"
704+
"而 ``install_requires`` 需求是“Abstract”,即不与任何特定索引相关联,需求文件通常包含 pip 选项,如 "
705+
"``--index-url`` 或 ``--find-links`` 使需求“Concrete”,即与包的特定索引或目录相关联。 [1]_"
704706

705707
#: ../source/discussions/install-requires-vs-requirements.rst:84
706708
msgid ""
@@ -1020,6 +1022,8 @@ msgid ""
10201022
"to distribute a :term:`Release`. The archive file is what an end-user will "
10211023
"download from the internet and install."
10221024
msgstr ""
1025+
"一个版本化的存档文件包含 Python :term:`packages <Import Package>`、:term:`modules "
1026+
"<Module>` 和其他用于分发:term:`Release` 的资源文件的版本化存档文件。存档文件是最终用户将从 Internet 下载并安装的文件。"
10231027

10241028
#: ../source/glossary.rst:34
10251029
msgid ""
@@ -1031,6 +1035,9 @@ msgid ""
10311035
"distribution), which are often referred to with the single term "
10321036
"\"distribution\"."
10331037
msgstr ""
1038+
"分发包更常被称为“包”或“分发”,但是当需要更清楚地防止与 :term:`Import Package` "
1039+
"混淆时,本指南可能会使用扩展术语(通常也称为“包”)或另一种发行版(例如 Linux 发行版或 Python "
1040+
"语言发行版),通常用单个术语“发行版”来指代。"
10341041

10351042
#: ../source/glossary.rst:41
10361043
msgid "Egg"
@@ -1067,7 +1074,7 @@ msgstr ""
10671074

10681075
#: ../source/glossary.rst:59
10691076
msgid "Known Good Set (KGS)"
1070-
msgstr ""
1077+
msgstr "已知良好集 (KGS)"
10711078

10721079
#: ../source/glossary.rst:62
10731080
msgid ""
@@ -1096,7 +1103,7 @@ msgid ""
10961103
"\", but this guide will use the expanded term when more clarity is needed to "
10971104
"prevent confusion with a :term:`Distribution Package` which is also commonly "
10981105
"called a \"package\"."
1099-
msgstr ""
1106+
msgstr "导入包通常用单个词“包”来指代,但本指南将在需要更清楚地说明时使用扩展术语,以防止与通常也称为“包”的 :term:`分发包` 混淆."
11001107

11011108
#: ../source/glossary.rst:78
11021109
msgid "Module"
@@ -1107,6 +1114,8 @@ msgid ""
11071114
"The basic unit of code reusability in Python, existing in one of two types: :"
11081115
"term:`Pure Module`, or :term:`Extension Module`."
11091116
msgstr ""
1117+
"Python 中代码可重用性的基本单元,存在于以下两种类型之一::term:`Pure Module` 或 :term:`Extension "
1118+
"Module`。"
11101119

11111120
#: ../source/glossary.rst:84
11121121
msgid "Package Index"
@@ -1116,7 +1125,7 @@ msgstr "包索引 (Package Index)"
11161125
msgid ""
11171126
"A repository of distributions with a web interface to automate :term:"
11181127
"`package <Distribution Package>` discovery and consumption."
1119-
msgstr ""
1128+
msgstr "一个带有 Web 界面的发行版存储库,用于自动化 :term:`package <Distribution Package>` 发现和消费。"
11201129

11211130
#: ../source/glossary.rst:90
11221131
msgid "Per Project Index"
@@ -1500,7 +1509,7 @@ msgstr ""
15001509

15011510
#: ../source/guides/analyzing-pypi-package-downloads.rst:58
15021511
msgid "Navigate to the `BigQuery web UI`_."
1503-
msgstr "导航到 `BigQuery 网页界面<BigQuery web UI>`_ 。"
1512+
msgstr "导航到 `BigQuery 网页用户界面`_。"
15041513

15051514
#: ../source/guides/analyzing-pypi-package-downloads.rst:59
15061515
msgid "Create a new project."
@@ -3266,7 +3275,7 @@ msgstr ""
32663275
#: ../source/specifications/core-metadata.rst:693
32673276
#: ../source/specifications/core-metadata.rst:722
32683277
msgid "Examples::"
3269-
msgstr "例子:"
3278+
msgstr "例子::"
32703279

32713280
#: ../source/guides/dropping-older-python-versions.rst:86
32723281
msgid ""

source/conf.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -389,26 +389,22 @@
389389

390390
linkcheck_ignore = [
391391
"http://localhost:\d+",
392-
# Ignoring these links as they will redirect to login page if folks haven't logged in.
393-
"https://github.com/pypa/packaging-problems/issues/new?/*",
394-
"https://console.cloud.google.com/bigquery/*",
395-
"https://console.developers.google.com/apis/library/bigquery-json.googleapis.com",
396-
"https://test.pypi.org/manage/account/#api-tokens",
397-
"https://pypi.org/manage/account/#api-tokens",
398-
# This shows that PyPI previously hosted at pypi.python.org
399-
"https://pypi.python.org",
400-
# Weblate has different UI for different languages
401-
"https://weblate.org/",
402-
# This is an example that showing to folks
392+
# This is an example that showing to the reader
403393
"https://test.pypi.org/project/example-pkg-YOUR-USERNAME-HERE",
394+
# Ignoring it as it will redirect to login page if reader hasn't logged in.
395+
"https://pypi.org/manage/*",
396+
"https://test.pypi.org/manage/*",
404397
]
405398

406399
# Example configuration for intersphinx: refer to the Python standard library.
407400
intersphinx_mapping = {
401+
'openstack': ('https://docs.openstack.org/glance/latest/', None),
408402
'python': ('https://docs.python.org/3', None),
409403
'python2': ('https://docs.python.org/2', None),
410404
'pip': ('https://pip.pypa.io/en/latest/', None),
405+
'scipy': ('https://www.scipy.org', None),
411406
'setuptools': ('https://setuptools.readthedocs.io/en/latest/', None),
407+
'tox': ('https://tox.readthedocs.io/en/latest/', None),
412408
'twine': ('https://twine.readthedocs.io/en/stable/', None),
413409
'pypa': ('https://www.pypa.io/en/latest/', None),
414410
'nox': ('https://nox.thea.codes/en/latest/', None),

source/guides/distributing-packages-using-setuptools.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ generated during the install of your :term:`distribution <Distribution
536536
Package>`.
537537

538538
For more information, see `Automatic Script Creation
539-
<https://setuptools.readthedocs.io/en/latest/setuptools.html#automatic-script-creation>`_
539+
<https://setuptools.readthedocs.io/en/latest/userguide/quickstart.html#entry-points-and-automatic-script-creation>`_
540540
from the :doc:`setuptools docs <setuptools:index>`.
541541

542542
.. _`Choosing a versioning scheme`:

source/guides/installing-scientific-packages.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ published on python.org.
9191

9292
macOS users also have access to Linux distribution style package managers
9393
such as ``MacPorts``. The SciPy site has more details on using MacPorts to
94-
install the `scientific Python stack
95-
<https://www.scipy.org/install.html#mac>`__
94+
install the :ref:`scientific Python stack
95+
<scipy:mac>`
9696

9797

9898
SciPy distributions

source/guides/installing-using-pip-and-virtual-environments.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ specifying the extra in brackets:
301301
py -m pip install requests[security]
302302
303303
.. _extras:
304-
https://setuptools.readthedocs.io/en/latest/setuptools.html#declaring-extras-optional-features-with-their-own-dependencies
304+
https://setuptools.readthedocs.io/en/latest/userguide/dependency_management.html#optional-dependencies
305305

306306

307307
Installing from source

source/guides/packaging-namespace-packages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,6 @@ in the `pkg_resources namespace example project`_.
238238

239239
.. _setuptools: https://setuptools.readthedocs.io/en/latest/
240240
.. _pkg_resources.declare_namespace:
241-
https://setuptools.readthedocs.io/en/latest/setuptools.html#namespace-packages
241+
https://setuptools.readthedocs.io/en/latest/pkg_resources.html#namespace-package-support
242242
.. _pkg_resources namespace example project:
243243
https://github.com/pypa/sample-namespace-packages/tree/master/pkg_resources

source/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,5 @@ sure that your release pipeline remains healthy!
144144
.. _`pypa/gh-action-pypi-publish GitHub Action`:
145145
https://github.com/marketplace/actions/pypi-publish
146146
.. _Secrets:
147-
https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#creating-and-using-secrets-encrypted-variables
147+
https://docs.github.com/en/actions/reference/encrypted-secrets
148+

source/guides/supporting-windows-using-appveyor.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Additional notes
149149
Testing with tox
150150
----------------
151151

152-
Many projects use the `Tox`_ tool to run their tests. It ensures that tests
152+
Many projects use the :doc:`Tox <tox:index>` tool to run their tests. It ensures that tests
153153
are run in an isolated environment using the exact files that will be distributed
154154
by the project.
155155

@@ -239,6 +239,6 @@ For reference, the SDK setup support script is listed here:
239239

240240
.. _Appveyor: https://www.appveyor.com//
241241
.. _Travis: https://travis-ci.org/
242-
.. _Github: https://github.com/
242+
.. _Github: https://github.com
243243
.. _Bitbucket: https://bitbucket.org/
244244
.. _Tox: https://tox.readthedocs.io/en/latest/

source/key_projects.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ fetching them from PyPI and modifying their metadata.
370370
devpi
371371
=====
372372

373-
`Docs <https://devpi.net/docs/devpi/devpi/latest/%2Bd/index.html>`__ |
374-
`Issues <https://github.com/devpi/devpi/issues>`__ |
373+
`Docs <http://doc.devpi.net/latest/>`__ |
374+
:gh:`Issues <devpi/devpi/issues>` |
375375
`PyPI <https://pypi.org/project/devpi>`__
376376

377377
devpi features a powerful PyPI-compatible server and PyPI proxy cache
@@ -406,8 +406,8 @@ Python 2, so long as they can be imported on Python 3.
406406
enscons
407407
=======
408408

409-
`Source <https://github.com/dholth/enscons>`__ |
410-
`Issues <https://github.com/dholth/enscons/issues>`__ |
409+
:gh:`Source <dholth/enscons>` |
410+
:gh:`Issues <dholth/enscons/issues>` |
411411
`PyPI <https://pypi.org/project/enscons>`__
412412

413413
Enscons is a Python packaging tool based on `SCons`_. It builds

source/overview.rst

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ respective packaging guides.
205205
* `Heroku <https://devcenter.heroku.com/articles/getting-started-with-python>`_
206206
* `Google App Engine <https://cloud.google.com/appengine/docs/python/>`_
207207
* `PythonAnywhere <https://www.pythonanywhere.com/>`_
208-
* `OpenShift <https://cloud.redhat.com/blog/getting-started-python>`_
209-
* "Serverless" frameworks like `Zappa <https://github.com/zappa/Zappa>`_
208+
* `OpenShift <https://blog.openshift.com/getting-started-python/>`_
209+
* "Serverless" frameworks like :gh:`Zappa <zappa/Zappa>`
210210

211211
In all these setups, the platform takes care of packaging and
212212
deployment, as long as you follow their patterns. Most software does
@@ -228,7 +228,7 @@ If you're planning on releasing to these new frontiers, you'll want to
228228
check out the following frameworks, and refer to their packaging
229229
guides:
230230

231-
* `Kivy <https://kivy.org/#home>`_
231+
* `Kivy <https://kivy.org/>`_
232232
* `Beeware <https://pybee.org/>`_
233233
* `Brython <https://brython.info/>`_
234234
* `Flexx <https://flexx.readthedocs.io/en/latest/>`_
@@ -248,9 +248,9 @@ machines of developers and data scientists.
248248

249249
Technologies which support this model:
250250

251-
* `PEX <https://github.com/pantsbuild/pex#pex>`_ (Python EXecutable)
251+
* :gh:`PEX <pantsbuild/pex#user-content-pex>` (Python EXecutable)
252252
* :doc:`zipapp <python:library/zipapp>` (does not help manage dependencies, requires Python 3.5+)
253-
* `shiv <https://github.com/linkedin/shiv#shiv>`_ (requires Python 3)
253+
* :gh:`shiv <linkedin/shiv#user-content-shiv>` (requires Python 3)
254254

255255
.. note:: Of all the approaches here, depending on a pre-installed
256256
Python relies the most on the target environment. Of course,
@@ -290,7 +290,7 @@ A similar model involves installing an alternative Python
290290
distribution, but does not support arbitrary operating system-level
291291
packages:
292292

293-
* `ActiveState ActivePython <https://www.activestate.com/products/python/>`_
293+
* `ActiveState ActivePython <https://www.activestate.com/activepython>`_
294294
* `WinPython <http://winpython.github.io/>`_
295295

296296
.. _bringing-your-own-python:
@@ -323,8 +323,8 @@ A selection of Python freezers:
323323
* `pynsist <https://pypi.org/project/pynsist/>`_ - Windows only
324324

325325
Most of the above imply single-user deployments. For multi-component
326-
server applications, see `Chef Omnibus
327-
<https://github.com/chef/omnibus#-omnibus>`_.
326+
server applications, see :gh:`Chef Omnibus
327+
<chef/omnibus#user-content--omnibus>`.
328328

329329

330330
Bringing your own userspace
@@ -361,7 +361,7 @@ data centers, though certain complex applications can benefit from
361361
this packaging. Technologies are Python agnostic, and include:
362362

363363
* `Vagrant <https://www.vagrantup.com/>`_
364-
* `VHD <https://en.wikipedia.org/wiki/VHD_(file_format)>`_, `AMI <https://en.wikipedia.org/wiki/Amazon_Machine_Image>`_, and `other formats <https://docs.openstack.org/glance/pike/user/formats.html>`_
364+
* `VHD <https://en.wikipedia.org/wiki/VHD_(file_format)>`_, `AMI <https://en.wikipedia.org/wiki/Amazon_Machine_Image>`_, and :doc:`other formats <openstack:user/formats>`
365365
* `OpenStack <https://www.redhat.com/en/topics/openstack>`_ - A cloud management system in Python, with extensive VM support
366366

367367
Bringing your own hardware
@@ -375,8 +375,7 @@ Whereas the virtual machines described above are primarily reserved
375375
for the tech-savvy, you can find hardware appliances being used by
376376
everyone from the most advanced data centers to the youngest children.
377377

378-
Embed your code on an `Adafruit
379-
<https://github.com/adafruit/circuitpython#adafruit-circuitpython>`_,
378+
Embed your code on an :gh:`Adafruit <adafruit/circuitpython>`,
380379
`MicroPython <https://micropython.org/>`_, or more-powerful hardware
381380
running Python, then ship it to the datacenter or your users'
382381
homes. They plug and play, and you can call it a day.

0 commit comments

Comments
 (0)