Skip to content

Commit c289752

Browse files
authored
Merge branch 'main' into added_obsolete
2 parents b4eba02 + a1deee1 commit c289752

39 files changed

+1450
-410
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Test
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
pull_request:
6+
schedule:
7+
- cron: "0 6 * * *" # daily at 6am
48

59
concurrency:
610
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -9,6 +13,7 @@ concurrency:
913
jobs:
1014
build:
1115
name: ${{ matrix.noxenv }}
16+
if: ${{ github.repository_owner == 'pypa' || github.event_name != 'schedule' }}
1217
runs-on: ubuntu-latest
1318
strategy:
1419
matrix:

.readthedocs.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ sphinx:
99
# https://github.com/pyca/cryptography/issues/5863#issuecomment-792343136
1010
builder: dirhtml
1111

12+
build:
13+
os: ubuntu-22.04
14+
tools:
15+
python: "3.11"
16+
1217
python:
13-
version: 3.8
1418
install:
1519
- requirements: requirements.txt

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ sphinx-autobuild==0.7.1
33
sphinx-inline-tabs==2021.4.11b9
44
python-docs-theme==2022.1
55
sphinx-copybutton==0.5.0
6-
git+https://github.com/pypa/pypa-docs-theme.git#egg=pypa-docs-theme
6+
pypa-docs-theme @ git+https://github.com/pypa/pypa-docs-theme.git

source/conf.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@
397397
# Example configuration for intersphinx: refer to the Python standard library.
398398
intersphinx_mapping = {
399399
'boltons': ('https://boltons.readthedocs.io/en/latest/', None),
400+
'bottle': ('https://bottlepy.org/docs/dev/', None),
400401
'build': ('https://pypa-build.readthedocs.io/en/stable/', None),
401402
'cffi': ('https://cffi.readthedocs.io/en/latest/', None),
402403
'conda': ('https://conda.io/en/latest/', None),
@@ -407,7 +408,7 @@
407408
'nox': ('https://nox.thea.codes/en/latest/', None),
408409
'openstack': ('https://docs.openstack.org/glance/latest/', None),
409410
'packaging': ('https://packaging.pypa.io/en/latest/', None),
410-
'packaging.python.org': ('https://packaging.python.org/', None),
411+
'packaging.python.org': ('https://packaging.python.org/en/latest/', None),
411412
'pip': ('https://pip.pypa.io/en/latest/', None),
412413
'pipenv': ('https://pipenv.pypa.io/en/latest/', None),
413414
'piwheels': ('https://piwheels.readthedocs.io/en/latest/', None),
@@ -416,10 +417,10 @@
416417
'pypa': ('https://www.pypa.io/en/latest/', None),
417418
'python': ('https://docs.python.org/3', None),
418419
'python-guide': ('https://docs.python-guide.org', None),
419-
'setuptools': ('https://setuptools.readthedocs.io/en/latest/', None),
420+
'setuptools': ('https://setuptools.pypa.io/en/latest/', None),
420421
'spack': ('https://spack.readthedocs.io/en/latest/', None),
421422
'sphinx': ('https://www.sphinx-doc.org/en/master', None),
422-
'tox': ('https://tox.readthedocs.io/en/latest/', None),
423+
'tox': ('https://tox.wiki/en/latest/', None),
423424
'twine': ('https://twine.readthedocs.io/en/stable/', None),
424425
'virtualenv': ('https://virtualenv.pypa.io/en/stable/', None),
425426
}

source/discussions/install-requires-vs-requirements.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ v2 of 'B', so it would be like so:
3838
'B>=2'
3939
]
4040

41-
It may also be known that project A follows semantic versioning, and that v2 of
42-
'A' will indicate a break in compatibility, so it makes sense to not allow v2:
41+
It may also be known that project 'A' introduced a change in its v2
42+
that breaks the compatibility of your project with v2 of 'A' and later,
43+
so it makes sense to not allow v2:
4344

4445
::
4546

source/discussions/wheel-vs-egg.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ Distribution>` and :term:`binary <Binary Distribution>` packaging for Python.
1717
Here's a breakdown of the important differences between :term:`Wheel` and :term:`Egg`.
1818

1919

20-
* :term:`Wheel` has an :pep:`official PEP <427>`. :term:`Egg` did not.
20+
* :term:`Wheel` has an :doc:`official standard specification
21+
</specifications/binary-distribution-format>`.
22+
:term:`Egg` did not.
2123

2224
* :term:`Wheel` is a :term:`distribution <Distribution Package>` format, i.e a packaging
2325
format. [1]_ :term:`Egg` was both a distribution format and a runtime
@@ -45,5 +47,5 @@ Here's a breakdown of the important differences between :term:`Wheel` and :term:
4547
----
4648

4749
.. [1] Circumstantially, in some cases, wheels can be used as an importable
48-
runtime format, although :pep:`this is not officially supported at this time
49-
<427#is-it-possible-to-import-python-code-directly-from-a-wheel-file>`.
50+
runtime format, although :ref:`this is not officially supported at this time
51+
<binary-distribution-format-import-wheel>`.

source/glossary.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Glossary
4242
Egg
4343

4444
A :term:`Built Distribution` format introduced by :ref:`setuptools`,
45-
which is being replaced by :term:`Wheel`. For details, see `
45+
which is being replaced by :term:`Wheel`. For details, see
4646
:doc:`The Internal Structure of Python Eggs <setuptools:deprecated/python_eggs>` and
4747
`Python Eggs <http://peak.telecommunity.com/DevCenter/PythonEggs>`_
4848

@@ -237,7 +237,9 @@ Glossary
237237

238238
Wheel
239239

240-
A :term:`Built Distribution` format introduced by :pep:`427`,
240+
A :term:`Built Distribution` format introduced by an official
241+
:doc:`standard specification
242+
</specifications/binary-distribution-format/>`,
241243
which is intended to replace the :term:`Egg` format. Wheel is currently
242244
supported by :ref:`pip`.
243245

source/guides/analyzing-pypi-package-downloads.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Useful queries
9494

9595
Run queries in the `BigQuery web UI`_ by clicking the "Compose query" button.
9696

97-
Note that the rows are stored in a partitioned, which helps
97+
Note that the rows are stored in a partitioned table, which helps
9898
limit the cost of queries. These example queries analyze downloads from
9999
recent history by filtering on the ``timestamp`` column.
100100

@@ -121,7 +121,7 @@ The following query counts the total number of downloads for the project
121121
| 26190085 |
122122
+---------------+
123123

124-
To only count downloads from pip, filter on the ``details.installer.name``
124+
To count downloads from pip only, filter on the ``details.installer.name``
125125
column.
126126

127127
::
@@ -311,7 +311,7 @@ Install `pypinfo`_ using pip.
311311

312312
.. code-block:: bash
313313
314-
python -m pip install pypinfo
314+
python3 -m pip install pypinfo
315315
316316
Usage:
317317

@@ -343,7 +343,7 @@ References
343343
.. _public PyPI download statistics dataset: https://console.cloud.google.com/bigquery?p=bigquery-public-data&d=pypi&page=dataset
344344
.. _Google BigQuery: https://cloud.google.com/bigquery
345345
.. _BigQuery web UI: https://console.cloud.google.com/bigquery
346-
.. _pypinfo: https://github.com/ofek/pypinfo/blob/master/README.rst
346+
.. _pypinfo: https://github.com/ofek/pypinfo
347347
.. _google-cloud-bigquery: https://cloud.google.com/bigquery/docs/reference/libraries
348348
.. _pandas-gbq: https://pandas-gbq.readthedocs.io/en/latest/
349349
.. _Pandas: https://pandas.pydata.org/

source/guides/creating-and-discovering-plugins.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,17 @@ then ``discovered_plugins`` would be:
4141
.. code-block:: python
4242
4343
{
44-
'flask_sqlachemy': <module: 'flask_sqlalchemy'>,
44+
'flask_sqlalchemy': <module: 'flask_sqlalchemy'>,
4545
'flask_talisman': <module: 'flask_talisman'>,
4646
}
4747
48-
Using naming convention for plugins also allows you to query the
49-
Python Package Index's `simple API`_ for all packages that conform to your
50-
naming convention.
48+
Using naming convention for plugins also allows you to query
49+
the Python Package Index's :ref:`simple repository API <simple-repository-api>`
50+
for all packages that conform to your naming convention.
5151

5252
.. _Flask: https://pypi.org/project/Flask/
5353
.. _Flask-SQLAlchemy: https://pypi.org/project/Flask-SQLAlchemy/
5454
.. _Flask-Talisman: https://pypi.org/project/flask-talisman
55-
.. _simple API: https://www.python.org/dev/peps/pep-0503/#specification
5655

5756

5857
Using namespace packages

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ sample project <https://github.com/pypa/sampleproject>`_.
7272

7373
2. It's the command line interface for running various commands that
7474
relate to packaging tasks. To get a listing of available commands, run
75-
``python setup.py --help-commands``.
75+
``python3 setup.py --help-commands``.
7676

7777

7878
setup.cfg
@@ -677,7 +677,7 @@ Change directory to the root of the project directory and run:
677677

678678
.. code-block:: bash
679679
680-
python -m pip install -e .
680+
python3 -m pip install -e .
681681
682682
683683
The pip command-line flag ``-e`` is short for ``--editable``, and ``.`` refers
@@ -693,7 +693,7 @@ you want "bar" installed from VCS in editable mode, then you could construct a
693693
requirements file like so::
694694

695695
-e .
696-
-e git+https://somerepo/bar.git#egg=bar
696+
-e bar @ git+https://somerepo/bar.git
697697

698698
The first line says to install your project and any dependencies. The second
699699
line overrides the "bar" dependency, such that it's fulfilled from VCS, not
@@ -712,7 +712,7 @@ Lastly, if you don't want to install any dependencies at all, you can run:
712712

713713
.. code-block:: bash
714714
715-
python -m pip install -e . --no-deps
715+
python3 -m pip install -e . --no-deps
716716
717717
718718
For more information, see the
@@ -812,7 +812,7 @@ To build the wheel:
812812

813813
.. code-block:: bash
814814
815-
python -m build --wheel
815+
python3 -m build --wheel
816816
817817
.. tab:: Windows
818818

0 commit comments

Comments
 (0)