Skip to content

Commit a586711

Browse files
authored
Merge branch 'pypa:main' into main
2 parents 7260424 + 55b8b32 commit a586711

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

noxfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ def build(session, autobuild=False):
4343
"-b", "html", # use HTML builder
4444
"-n", # nitpicky warn about all missing references
4545
"-W", # Treat warnings as errors.
46+
*session.posargs,
4647
"source", # where the rst files are located
4748
target_build_dir, # where to put the html output
4849
)

source/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
# Usually you set "language" from the command line for these cases.
9090
language = None
9191

92+
locale_dirs = ['../locales']
93+
9294
# making all documents use single text domain
9395
gettext_compact = "messages"
9496

source/specifications/direct-url.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -278,18 +278,18 @@ Example pip commands and their effect on direct_url.json
278278

279279
Commands that generate a ``direct_url.json``:
280280

281-
* pip install https://example.com/app-1.0.tgz
282-
* pip install https://example.com/app-1.0.whl
283-
* pip install "git+https://example.com/repo/app.git#egg=app&subdirectory=setup"
284-
* pip install ./app
285-
* pip install file:///home/user/app
286-
* pip install --editable "git+https://example.com/repo/app.git#egg=app&subdirectory=setup"
281+
* ``pip install https://example.com/app-1.0.tgz``
282+
* ``pip install https://example.com/app-1.0.whl``
283+
* ``pip install "git+https://example.com/repo/app.git#egg=app&subdirectory=setup"``
284+
* ``pip install ./app``
285+
* ``pip install file:///home/user/app``
286+
* ``pip install --editable "git+https://example.com/repo/app.git#egg=app&subdirectory=setup"``
287287
(in which case, ``url`` will be the local directory where the git repository has been
288288
cloned to, and ``dir_info`` will be present with ``"editable": true`` and no
289289
``vcs_info`` will be set)
290-
* pip install -e ./app
290+
* ``pip install -e ./app``
291291

292292
Commands that *do not* generate a ``direct_url.json``
293293

294-
* pip install app
295-
* pip install app --no-index --find-links https://example.com/
294+
* ``pip install app``
295+
* ``pip install app --no-index --find-links https://example.com/``

0 commit comments

Comments
 (0)