Skip to content

Commit 85bbb90

Browse files
Merge branch 'main' into translation/source
2 parents 8fe7905 + cd31077 commit 85bbb90

3 files changed

Lines changed: 24 additions & 16 deletions

File tree

source/guides/supporting-multiple-python-versions.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@ of many continuous-integration systems. There are two hosted services which
6262
when used in conjunction provide automated testing across Linux, Mac and
6363
Windows:
6464

65-
- `Travis CI <https://travis-ci.com>`_ provides both a Linux and a macOS
66-
environment. The Linux environment is Ubuntu 12.04 LTS Server Edition 64 bit
67-
while the macOS is 10.9.2 at the time of writing.
65+
- `GitHub Actions <https://docs.github.com/en/actions>`_ provides Windows,
66+
Linux and a macOS environments.
6867
- `Appveyor <https://www.appveyor.com/>`_ provides a Windows environment
6968
(Windows Server 2012).
7069

@@ -76,7 +75,7 @@ Windows:
7675
TODO How do we keep the Travis Linux and macOS versions up-to-date in this
7776
document?
7877

79-
Both `Travis CI`_ and Appveyor_ require a `YAML
78+
Both `GitHub Actions`_ and Appveyor_ require a `YAML
8079
<https://yaml.org>`_-formatted file as specification for the instructions
8180
for testing. If any tests fail, the output log for that specific configuration
8281
can be inspected.

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ Many projects are developed on Unix by default, and providing Windows support
2020
can be a challenge, because setting up a suitable Windows test environment is
2121
non-trivial, and may require buying software licenses.
2222

23-
The Appveyor service is a continuous integration service, much like the
24-
better-known `Travis`_ service that is commonly used for testing by projects
25-
hosted on `GitHub`_. However, unlike Travis, the build workers on Appveyor are
26-
Windows hosts and have the necessary compilers installed to build Python
27-
extensions.
28-
2923
Windows users typically do not have access to a C compiler, and therefore are
3024
reliant on projects that use C extensions distributing binary wheels on PyPI in
3125
order for the distribution to be installable via ``python -m pip install <dist>``. By
@@ -46,8 +40,7 @@ your project is hosted on one of those two services, setting up Appveyor
4640
integration is straightforward.
4741

4842
Once you have set up your Appveyor account and added your project, Appveyor will
49-
automatically build your project each time a commit occurs. This behaviour will
50-
be familiar to users of Travis.
43+
automatically build your project each time a commit occurs.
5144

5245
Adding Appveyor support to your project
5346
=======================================
@@ -179,7 +172,7 @@ other CI systems).
179172

180173
2. When used interactively, ``tox`` allows you to run your tests against multiple
181174
environments (often, this means multiple Python versions). This feature is not as
182-
useful in a CI environment like Travis or Appveyor, where all tests are run in
175+
useful in a CI environment like Appveyor, where all tests are run in
183176
isolated environments for each configuration. As a result, projects often supply
184177
an argument ``-e ENVNAME`` to ``tox`` to specify which environment to use (there
185178
are default environments for most versions of Python).
@@ -237,6 +230,6 @@ For reference, the SDK setup support script is listed here:
237230
:linenos:
238231

239232
.. _Appveyor: https://www.appveyor.com/
240-
.. _Travis: https://travis-ci.com/
241233
.. _GitHub: https://github.com
234+
.. _GitHub Actions: https://docs.github.com/en/actions
242235
.. _Bitbucket: https://bitbucket.org/

source/specifications/pylock-toml.rst

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,15 +449,26 @@ See :ref:`pylock-packages-vcs-subdirectory`.
449449
``packages.archive.url``
450450
''''''''''''''''''''''''
451451

452-
See :ref:`pylock-packages-vcs-url`.
452+
- **Type**: string
453+
- **Required?**: if :ref:`pylock-packages-archive-path` is not specified
454+
- **Inspiration**: :ref:`direct-url-data-structure-archive`
455+
- The URL_ to the archive.
453456

454457

455458
.. _pylock-packages-archive-path:
456459

457460
``packages.archive.path``
458461
'''''''''''''''''''''''''
459462

460-
See :ref:`pylock-packages-vcs-path`.
463+
- **Type**: string
464+
- **Required?**: if :ref:`pylock-packages-archive-url` is not specified
465+
- **Inspiration**: :ref:`direct-url-data-structure-archive`
466+
- The path to the archive.
467+
- If a relative path is used it MUST be relative to the location of this file.
468+
- If the path is relative it MAY use POSIX-style path separators explicitly
469+
for portability.
470+
- If :ref:`pylock-packages-archive-url` is also specified, the filename as
471+
specified by this key takes precedence.
461472

462473

463474
.. _pylock-packages-archive-size:
@@ -554,6 +565,8 @@ See :ref:`pylock-packages-vcs-subdirectory`.
554565
the same value
555566
- **Inspiration**: PDM_, Poetry_, uv_
556567
- The file name of the :ref:`source-distribution-format-sdist` file.
568+
- If specified, this key's value takes precedence over the file name found in
569+
either :ref:`pylock-packages-sdist-url` or :ref:`pylock-packages-sdist-path`.
557570

558571

559572
.. _pylock-packages-sdist-upload-time:
@@ -623,6 +636,8 @@ See :ref:`pylock-packages-archive-hashes`.
623636
the same value
624637
- **Inspiration**: PDM_, Poetry_, uv_
625638
- The file name of the :ref:`binary-distribution-format` file.
639+
- If specified, this key's value takes precedence over the file name found in
640+
either :ref:`pylock-packages-wheels-url` or :ref:`pylock-packages-wheels-path`.
626641

627642

628643
.. _pylock-packages-wheels-upload-time:
@@ -826,6 +841,7 @@ History
826841
-------
827842

828843
- April 2025: Initial version, approved via :pep:`751`.
844+
- March 2026: Clarify file name precedence for archives, sdists, and wheels.
829845

830846

831847
.. _Content-Length: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Length

0 commit comments

Comments
 (0)