Skip to content

Commit 20349b7

Browse files
authored
Merge branch 'main' into section-on-file-paths
2 parents 51ebaa6 + 7c22708 commit 20349b7

File tree

6 files changed

+13
-20
lines changed

6 files changed

+13
-20
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,14 @@ jobs:
1717
- linkcheck
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121

2222
- name: Set up Python
23-
uses: actions/setup-python@v2
23+
uses: actions/setup-python@v4
2424
with:
2525
python-version: 3.9
26-
27-
- name: pip cache
28-
uses: actions/cache@v2
29-
with:
30-
path: ~/.cache/pip
31-
key:
32-
${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('noxfile.py') }}
33-
restore-keys: |
34-
${{ matrix.os }}-${{ matrix.python-version }}-
26+
cache: 'pip'
27+
cache-dependency-path: 'requirements.txt'
3528

3629
- name: Install dependencies
3730
run: |

.github/workflows/translation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818

1919
steps:
2020
- name: Grab the repo src
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
with:
2323
fetch-depth: 0 # To reach the common commit
2424
- name: Set up git user as [bot]
2525
# Refs:
2626
# * https://github.community/t/github-actions-bot-email-address/17204/6
2727
# * https://github.com/actions/checkout/issues/13#issuecomment-724415212
28-
uses: fregante/setup-git-user@v1.0.1
28+
uses: fregante/setup-git-user@v1.1.0
2929

3030
- name: Switch to the translation source branch
3131
run: |
@@ -50,7 +50,7 @@ jobs:
5050
git merge '${{ github.event.repository.default_branch }}'
5151
5252
- name: Set up Python
53-
uses: actions/setup-python@v2
53+
uses: actions/setup-python@v4
5454
with:
5555
python-version: >-
5656
3.10

source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@
416416
'pypa': ('https://www.pypa.io/en/latest/', None),
417417
'python': ('https://docs.python.org/3', None),
418418
'python-guide': ('https://docs.python-guide.org', None),
419-
'python2': ('https://docs.python.org/2', None),
420419
'setuptools': ('https://setuptools.readthedocs.io/en/latest/', None),
421420
'spack': ('https://spack.readthedocs.io/en/latest/', None),
422421
'sphinx': ('https://www.sphinx-doc.org/en/master', None),

source/contribute.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ need:
135135
See the :doc:`Hitchhiker's Guide to Python installation instructions <python-guide:starting/installation>`
136136
to install Python 3.8 on your operating system.
137137

138-
To build the guide, run the following bash command in the source folder:
138+
To build the guide, run the following shell command in the project's root folder:
139139

140140
.. code-block:: bash
141141

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Getting set up
5151

5252
In order to use `Google BigQuery`_ to query the `public PyPI download
5353
statistics dataset`_, you'll need a Google account and to enable the BigQuery
54-
API on a Google Cloud Platform project. You can run the up to 1TB of queries
54+
API on a Google Cloud Platform project. You can run up to 1TB of queries
5555
per month `using the BigQuery free tier without a credit card
5656
<https://cloud.google.com/blog/products/data-analytics/query-without-a-credit-card-introducing-bigquery-sandbox>`__
5757

source/key_projects.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ distlib
6464
=======
6565

6666
:doc:`Docs <distlib:index>` |
67-
`Issues <https://bitbucket.org/pypa/distlib/issues?status=new&status=open>`__ |
68-
`Bitbucket <https://bitbucket.org/pypa/distlib>`__ |
67+
`Issues <https://github.com/pypa/distlib/issues>`__ |
68+
`GitHub <https://github.com/pypa/distlib>`__ |
6969
`PyPI <https://pypi.org/project/distlib>`__
7070

7171
``distlib`` is a library which implements low-level functions that
@@ -496,7 +496,8 @@ make deployment of Python applications as simple as ``cp``.
496496
pip-tools
497497
=========
498498

499-
`GitHub and Docs <https://github.com/jazzband/pip-tools/>`__ |
499+
`Docs <https://pip-tools.readthedocs.io/en/latest/>`__ |
500+
`GitHub <https://github.com/jazzband/pip-tools/>`__ |
500501
`PyPI <https://pypi.org/project/pip-tools/>`__
501502

502503
pip-tools is a suite of tools meant for Python system administrators

0 commit comments

Comments
 (0)