Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ or as a directory — and you want to distribute it.

flit publish

Once your package is published, people can install it using *pip* just like
Once your package is published, people can install it using pip just like
any other package. In most cases, pip will download a 'wheel' package, a
standard format it knows how to install. If you specifically ask pip to install
an 'sdist' package, it will install and use Flit in a temporary environment.
Expand Down
8 changes: 4 additions & 4 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ Only the latest non-prerelease version is supported.

## Security contact information

To report a security vulnerability
To report a security vulnerability:

### Directly on GitHub

You can also directly propose a GitHub security advisory on the Flit Security page of github:
You can directly propose a GitHub security advisory on the Flit Security page of GitHub:

[https://github.com/pypa/flit/security](https://github.com/pypa/flit/security)

### via Tidelift:
### Via Tidelift:

You can use the
[Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the
fix and disclosure.

If you are a tidelift subscriber, this is the preferred path
If you are a Tidelift subscriber, this is the preferred path.
4 changes: 2 additions & 2 deletions doc/cmdline.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Common options
Path to a config file specifying the module to build. The default is
``pyproject.toml``.

.. option:: --version
.. option:: --version

Show the version of Flit in use.

Expand Down Expand Up @@ -196,7 +196,7 @@ Flit guess.

.. program:: flit init

Create a new ``pyproject.toml`` config file by prompting for information about
Create a new ``pyproject.toml`` config file by prompting for information about
the module in the current directory.

Environment variables
Expand Down
8 changes: 4 additions & 4 deletions doc/history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Version 3.10
or user tokens (:samp:`pypi_token:user:{username}`).
- The ``--python`` option can now take the path of a virtualenv folder, as an
alternative to a Python executable (:ghpull:`667`).
- Flit will work with current development versions of Pythona again (:ghpull:`684`).
- The ``flit`` command line package now requires Python 3.8 or above (:ghpulL:`660`).
- Flit will work with current development versions of Python again (:ghpull:`684`).
- The ``flit`` command line package now requires Python 3.8 or above (:ghpull:`660`).
``flit_core`` still works with Python 3.6 or above.
- The metadata in packages now has the names of optional dependency groups
("extras") normalised, complying with version 2.3 of the metadata standard
Expand All @@ -56,7 +56,7 @@ Version 3.10
(:ghpull:`674`). It's a good idea to always set a maximum version for the
build requirement, to protect against changes in future major versions of Flit.
- Avoid using the deprecated ``datetime.utcfromtimestamp()`` (:ghpull:`682`).
- Flit now has a ``SECURITY.md`` file in the Github repository (:ghpull:`665`).
- Flit now has a ``SECURITY.md`` file in the GitHub repository (:ghpull:`665`).
- The tests for ``flit_core`` are no longer part of the installed package,
reducing the size of the wheels (:ghpull:`691`).

Expand Down Expand Up @@ -526,7 +526,7 @@ Version 0.8
-----------

- A new ``flit installfrom`` subcommand to install a project from a source
archive, such as from Github.
archive, such as from GitHub.
- :doc:`Reproducible builds <reproducible>` - you can produce byte-for-byte
identical wheels.
- A warning for non-canonical version numbers according to `PEP 440
Expand Down
6 changes: 3 additions & 3 deletions doc/pyproject_toml.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ readme
an optional ``content-type`` key (e.g. ``text/x-rst``).
requires-python
A version specifier for the versions of Python this requires, e.g. ``~=3.3`` or
``>=3.3,<4``, which are equivalents.
``>=3.3,<4``, which are equivalent.
license
A valid SPDX `license expression <https://peps.python.org/pep-0639/#term-license-expression>`_
or a table with either a ``file`` key (a relative path to a license file) or a
Expand All @@ -115,7 +115,7 @@ classifiers
Add ``Private :: Do Not Upload`` into the list to prevent a private package
from being uploaded to PyPI by accident.
import-names
A list containing the importable module name in this package. You don't
A list containing the importable module names in this package. You don't
normally need to supply this manually, but you can specify it with a
``; private`` suffix to record that the module is not intended for public use.
This does not stop anyone importing it.
Expand Down Expand Up @@ -214,7 +214,7 @@ without a console.
Entry points sections
~~~~~~~~~~~~~~~~~~~~~

You can declare `entry points <http://entrypoints.readthedocs.io/en/latest/>`_
You can declare `entry points <https://entrypoints.readthedocs.io/en/latest/>`_
using sections named :samp:`[project.entry-points.{groupname}]`. E.g. to
provide a pygments lexer from your package:

Expand Down
4 changes: 2 additions & 2 deletions doc/upload.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ you can configure Flit in two main ways:
Using .pypirc
-------------

You can create or edit a config file in your home directory, ``~/.pypirc`` that
will be used by default or you can specify a custom location.
You can create or edit a config file in your home directory, ``~/.pypirc``, that
will be used by default, or you can specify a custom location.
This is also used by other Python tools such as `twine
<https://pypi.python.org/pypi/twine>`_.

Expand Down