Skip to content

Commit 632f397

Browse files
nedbatnedbat
committed
build: use .txt instead of .pip, even though it's a stupid extension
Dependabot doesn't understand .pip, so revert to the mean, and use .txt for installation manifests even though they are not text. Grrr.
1 parent ffc6a4a commit 632f397

27 files changed

Lines changed: 63 additions & 63 deletions

‎.github/workflows/coverage.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- ".github/workflows/coverage.yml"
5858
- "tox.ini"
5959
- "metacov.ini"
60-
- "requirements/*.pip"
60+
- "requirements/*.txt"
6161
- "tests/gold/**"
6262
6363
coverage:
@@ -133,7 +133,7 @@ jobs:
133133
# 3.10 on Windows. Commenting out the cache here fixed it. Someday
134134
# try using the cache again.
135135
#cache: pip
136-
#cache-dependency-path: 'requirements/*.pip'
136+
#cache-dependency-path: 'requirements/*.txt'
137137

138138
- name: "Show environment"
139139
run: |
@@ -146,7 +146,7 @@ jobs:
146146
- name: "Install dependencies"
147147
run: |
148148
set -xe
149-
python -m pip install -r requirements/tox.pip
149+
python -m pip install -r requirements/tox.txt
150150
151151
- name: "Run tox coverage for ${{ matrix.python-version }}"
152152
env:
@@ -194,7 +194,7 @@ jobs:
194194
# 3.10 on Windows. Commenting out the cache here fixed it. Someday
195195
# try using the cache again.
196196
#cache: pip
197-
#cache-dependency-path: 'requirements/*.pip'
197+
#cache-dependency-path: 'requirements/*.txt'
198198

199199
- name: "Show environment"
200200
run: |
@@ -207,7 +207,7 @@ jobs:
207207
run: |
208208
set -xe
209209
python -m pip install -e .
210-
python -m pip install -r requirements/pytest.pip
210+
python -m pip install -r requirements/pytest.txt
211211
python igor.py zip_mods
212212
213213
- name: "Download coverage data"

‎.github/workflows/kit.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
with:
193193
python-version: "${{ matrix.cipy }}"
194194
cache: pip
195-
cache-dependency-path: 'requirements/*.pip'
195+
cache-dependency-path: 'requirements/*.txt'
196196

197197
# Rust toolchain is not currently installed on windows arm64 images.
198198
# We need it for nh3, needed by readme-renderer, needed by twine.
@@ -208,7 +208,7 @@ jobs:
208208
209209
- name: "Install tools"
210210
run: |
211-
python -m pip install -r requirements/kit.pip
211+
python -m pip install -r requirements/kit.txt
212212
213213
- name: "Set up QEMU"
214214
if: ${{ matrix.arch == 'riscv64' }}
@@ -257,11 +257,11 @@ jobs:
257257
with:
258258
python-version: "3.11" # PYVERSIONS: the kit-building version
259259
cache: pip
260-
cache-dependency-path: 'requirements/*.pip'
260+
cache-dependency-path: 'requirements/*.txt'
261261

262262
- name: "Install tools"
263263
run: |
264-
python -m pip install -r requirements/kit.pip
264+
python -m pip install -r requirements/kit.txt
265265
266266
- name: "Build non-binary artifacts"
267267
env:

‎.github/workflows/python-nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
111111
- name: "Install dependencies"
112112
run: |
113-
python -m pip install -r requirements/tox.pip
113+
python -m pip install -r requirements/tox.txt
114114
115115
- name: "Run tox"
116116
run: |

‎.github/workflows/quality.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
workflow:
5959
- ".github/workflows/quality.yml"
6060
- "tox.ini"
61-
- "requirements/*.pip"
61+
- "requirements/*.txt"
6262
6363
lint:
6464
name: "Pylint etc"
@@ -84,11 +84,11 @@ jobs:
8484
with:
8585
python-version: "3.10" # Minimum of PYVERSIONS
8686
cache: pip
87-
cache-dependency-path: 'requirements/*.pip'
87+
cache-dependency-path: 'requirements/*.txt'
8888

8989
- name: "Install dependencies"
9090
run: |
91-
python -m pip install -r requirements/tox.pip
91+
python -m pip install -r requirements/tox.txt
9292
9393
- name: "Tox lint"
9494
run: |
@@ -114,11 +114,11 @@ jobs:
114114
with:
115115
python-version: "3.10" # Minimum of PYVERSIONS
116116
cache: pip
117-
cache-dependency-path: 'requirements/*.pip'
117+
cache-dependency-path: 'requirements/*.txt'
118118

119119
- name: "Install dependencies"
120120
run: |
121-
python -m pip install -r requirements/tox.pip
121+
python -m pip install -r requirements/tox.txt
122122
123123
- name: "Tox mypy"
124124
run: |
@@ -149,7 +149,7 @@ jobs:
149149
with:
150150
python-version: "3.12" # Doc version from PYVERSIONS
151151
cache: pip
152-
cache-dependency-path: 'requirements/*.pip'
152+
cache-dependency-path: 'requirements/*.txt'
153153

154154
- name: "Show environment"
155155
run: |
@@ -161,7 +161,7 @@ jobs:
161161
- name: "Install dependencies"
162162
run: |
163163
set -xe
164-
python -m pip install -r requirements/tox.pip
164+
python -m pip install -r requirements/tox.txt
165165
166166
- name: "Tox doc"
167167
run: |

‎.github/workflows/testsuite.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- "**.c"
5656
- ".github/workflows/testsuite.yml"
5757
- "tox.ini"
58-
- "requirements/*.pip"
58+
- "requirements/*.txt"
5959
- "tests/gold/**"
6060
6161
tests:
@@ -129,7 +129,7 @@ jobs:
129129
# 3.10 on Windows. Commenting out the cache here fixed it. Someday
130130
# try using the cache again.
131131
#cache: pip
132-
#cache-dependency-path: 'requirements/*.pip'
132+
#cache-dependency-path: 'requirements/*.txt'
133133

134134
- name: "Show environment"
135135
run: |
@@ -149,7 +149,7 @@ jobs:
149149
- name: "Install dependencies"
150150
run: |
151151
set -xe
152-
python -m pip install -r requirements/tox.pip
152+
python -m pip install -r requirements/tox.txt
153153
154154
- name: "Run tox for ${{ matrix.python-version }}"
155155
run: |

‎.readthedocs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ formats: []
2121

2222
python:
2323
install:
24-
- requirements: doc/requirements.pip
24+
- requirements: doc/requirements.txt
2525
- method: pip
2626
path: .

‎MANIFEST.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ recursive-include .github *
3636
recursive-include coverage *.pyi
3737
recursive-include coverage/ctracer *.c *.h
3838

39-
recursive-include doc *.py *.in *.pip *.rst *.txt *.png
39+
recursive-include doc *.py *.in *.rst *.txt *.png
4040
recursive-include doc/_static *
4141
prune doc/_build
4242
prune doc/_spell
4343

44-
recursive-include requirements *.in *.pip
44+
recursive-include requirements *.in *.txt
4545

4646
recursive-include tests *.py *.tok
4747
recursive-include tests/gold *

‎Makefile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ venv: .venv #- Create a virtualenv in .venv.
7575
$(VENV)
7676

7777
install: venv #- Install the developer tools.
78-
$(INSTALL_R) requirements/dev.pip
78+
$(INSTALL_R) requirements/dev.txt
7979

8080

8181
### Tests and quality checks
@@ -112,11 +112,11 @@ metahtml: #- Produce meta-coverage HTML reports.
112112

113113
# When updating requirements, a few rules to follow:
114114
#
115-
# 1) Don't install more than one .pip file at once. Always use pip-compile to
116-
# combine .in files onto a single .pip file that can be installed where needed.
115+
# 1) Don't install more than one .txt file at once. Always use pip-compile to
116+
# combine .in files onto a single .txt file that can be installed where needed.
117117
#
118118
# 2) Check manual pins before `make upgrade` to see if they can be removed. Look
119-
# in requirements/pins.pip, and search for "windows" in .in files to find pins
119+
# in requirements/pins.txt, and search for "windows" in .in files to find pins
120120
# and extra requirements that have been needed, but might be obsolete.
121121

122122
.PHONY: upgrade upgrade_one _upgrade diff_upgrade
@@ -135,24 +135,24 @@ PIP_COMPILE = uv pip compile -q --universal --generate-hashes ${COMPILE_OPTS}
135135
# Limit to packages that were released more than 10 days ago.
136136
# https://blog.yossarian.net/2025/11/21/We-should-all-be-using-dependency-cooldowns
137137
upgrade: export UV_EXCLUDE_NEWER=P10D
138-
upgrade: #- Update the *.pip files with the latest packages satisfying *.in files.
138+
upgrade: #- Update the *.txt files with the latest packages satisfying *.in files.
139139
$(MAKE) _upgrade COMPILE_OPTS="--upgrade"
140140

141141
# Upgrade just one package, with no cooldown.
142-
upgrade_one: #- Update the *.pip files for one package. `make upgrade_one package=...`
142+
upgrade_one: #- Update the *.txt files for one package. `make upgrade_one package=...`
143143
@test -n "$(package)" || { echo "\nUsage: make upgrade_one package=...\n"; exit 1; }
144144
$(MAKE) _upgrade COMPILE_OPTS="--upgrade-package $(package)"
145145

146146
_upgrade: export UV_CUSTOM_COMPILE_COMMAND=make upgrade
147147
_upgrade: $(DOCBIN) $(KITBIN)
148-
$(PIP_COMPILE) -o requirements/pip.pip requirements/pip.in
149-
$(PIP_COMPILE) -o requirements/pytest.pip requirements/pytest.in
150-
$(PIP_COMPILE) -p $(KITBIN)/python3 -o requirements/kit.pip requirements/kit.in
151-
$(PIP_COMPILE) -o requirements/tox.pip requirements/tox.in
152-
$(PIP_COMPILE) -o requirements/dev.pip requirements/dev.in
153-
$(PIP_COMPILE) -o requirements/light-threads.pip requirements/light-threads.in
154-
$(PIP_COMPILE) -o requirements/mypy.pip requirements/mypy.in
155-
$(PIP_COMPILE) -p $(DOCBIN)/python3 -o doc/requirements.pip doc/requirements.in
148+
$(PIP_COMPILE) -o requirements/pip.txt requirements/pip.in
149+
$(PIP_COMPILE) -o requirements/pytest.txt requirements/pytest.in
150+
$(PIP_COMPILE) -p $(KITBIN)/python3 -o requirements/kit.txt requirements/kit.in
151+
$(PIP_COMPILE) -o requirements/tox.txt requirements/tox.in
152+
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
153+
$(PIP_COMPILE) -o requirements/light-threads.txt requirements/light-threads.in
154+
$(PIP_COMPILE) -o requirements/mypy.txt requirements/mypy.in
155+
$(PIP_COMPILE) -p $(DOCBIN)/python3 -o doc/requirements.txt doc/requirements.in
156156
PYTHONWARNDEFAULTENCODING= pre-commit autoupdate
157157

158158
diff_upgrade: #- Summarize the last `make upgrade`.

‎doc/contributing.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ these steps:
6666
#. Install the requirements with either of these commands::
6767

6868
$ make install
69-
$ python3 -m pip install -r requirements/dev.pip
69+
$ python3 -m pip install -r requirements/dev.txt
7070

7171
Note: You may need to upgrade pip to install the requirements.
7272

@@ -95,7 +95,7 @@ to run them locally for faster feedback::
9595
% python3 -m tox -e py310
9696
py310: pip-26.0.1-py3-none-any.whl already present in /Users/ned/.cache/virtualenv/wheel/3.10/embed/3/pip.json
9797
py310: setuptools-82.0.1-py3-none-any.whl already present in /Users/ned/.cache/virtualenv/wheel/3.10/embed/3/setuptools.json
98-
py310: install_deps> python -m pip install -U -r requirements/pip.pip -r requirements/pytest.pip -r requirements/light-threads.pip
98+
py310: install_deps> python -m pip install -U -r requirements/pip.txt -r requirements/pytest.txt -r requirements/light-threads.txt
9999
.pkg: install_requires> python -I -m pip install setuptools
100100
.pkg: _optional_hooks> python /Users/ned/coverage/trunk/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta
101101
.pkg: get_requires_for_build_sdist> python /Users/ned/coverage/trunk/.venv/lib/python3.10/site-packages/pyproject_api/_backend.py True setuptools.build_meta
@@ -299,7 +299,7 @@ that way.
299299

300300
It has many development dependencies. These are specified generically in the
301301
``requirements/*.in`` files. The .in files should have no versions specified
302-
in them. The specific versions to use are pinned in ``requirements/*.pip``
302+
in them. The specific versions to use are pinned in ``requirements/*.txt``
303303
files. These are created by running ``make upgrade``.
304304

305305
.. minimum of PYVERSIONS:
@@ -309,7 +309,7 @@ versions will work on all of the Python versions currently supported by
309309
coverage.py.
310310

311311
If for some reason we need to constrain a version of a dependency, the
312-
constraint should be specified in the ``requirements/pins.pip`` file, with a
312+
constraint should be specified in the ``requirements/pins.txt`` file, with a
313313
detailed reason for the pin.
314314

315315

‎doc/requirements.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# For details: https://github.com/coveragepy/coveragepy/blob/main/NOTICE.txt
33

44
# PyPI requirements input for building documentation for coverage.py
5-
# "make upgrade" turns this into doc/requirements.pip
5+
# "make upgrade" turns this into doc/requirements.txt
66

7-
-c ../requirements/pins.pip
7+
-c ../requirements/pins.txt
88

99
cogapp
1010
doc8

0 commit comments

Comments
 (0)