Skip to content

Commit

Permalink
Merge branch 'nedbat:master' into keep_sorted_columns
Browse files Browse the repository at this point in the history
  • Loading branch information
devdanzin committed Apr 28, 2024
2 parents c3303b0 + fb52e47 commit 796239e
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 33 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

##@ Utilities

.PHONY: help clean_platform clean sterile
.PHONY: help clean_platform clean sterile install

help: ## Show this help.
@# Adapted from https://www.thapaliya.com/en/writings/well-documented-makefiles/
Expand Down Expand Up @@ -50,6 +50,9 @@ sterile: clean ## Remove all non-controlled content, even if expensive.
rm -rf .tox
rm -f cheats.txt

install: ## Install the developer tools
python3 -m pip install -r requirements/dev.pip


##@ Tests and quality checks

Expand Down
3 changes: 1 addition & 2 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,9 @@
}

nitpick_ignore = [
("py:class", "frame"),
("py:class", "module"),
("py:class", "DefaultValue"),
("py:class", "FilePath"),
("py:class", "types.FrameType"),
("py:class", "TWarnFn"),
("py:class", "TDebugCtl"),
]
Expand Down
3 changes: 2 additions & 1 deletion doc/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ these steps:
$ git clone https://github.com/GITHUB_USER/coveragepy
$ cd coveragepy

#. Install the requirements::
#. Install the requirements with either of these commands::

$ make install
$ python3 -m pip install -r requirements/dev.pip

Note: You may need to upgrade pip to install the requirements.
Expand Down
33 changes: 23 additions & 10 deletions doc/requirements.pip
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
#
alabaster==0.7.16
# via sphinx
anyio==4.3.0
# via
# starlette
# watchfiles
attrs==23.2.0
# via scriv
babel==2.14.0
Expand All @@ -18,6 +22,7 @@ click==8.1.7
# via
# click-log
# scriv
# uvicorn
click-log==0.4.0
# via scriv
cogapp==3.4.1
Expand All @@ -32,16 +37,18 @@ docutils==0.20.1
# restructuredtext-lint
# sphinx
# sphinx-rtd-theme
idna==3.6
# via requests
h11==0.14.0
# via uvicorn
idna==3.7
# via
# anyio
# requests
imagesize==1.4.1
# via sphinx
jinja2==3.1.3
# via
# scriv
# sphinx
livereload==2.6.3
# via sphinx-autobuild
markdown-it-py==3.0.0
# via scriv
markupsafe==2.1.5
Expand All @@ -68,11 +75,11 @@ restructuredtext-lint==1.4.0
# via doc8
scriv==1.5.1
# via -r doc/requirements.in
six==1.16.0
# via livereload
sniffio==1.3.1
# via anyio
snowballstemmer==2.2.0
# via sphinx
sphinx==7.2.6
sphinx==7.3.7
# via
# -r doc/requirements.in
# sphinx-autobuild
Expand All @@ -81,7 +88,7 @@ sphinx==7.2.6
# sphinxcontrib-jquery
# sphinxcontrib-restbuilder
# sphinxcontrib-spelling
sphinx-autobuild==2024.2.4
sphinx-autobuild==2024.4.16
# via -r doc/requirements.in
sphinx-code-tabs==0.5.5
# via -r doc/requirements.in
Expand All @@ -105,9 +112,15 @@ sphinxcontrib-serializinghtml==1.1.10
# via sphinx
sphinxcontrib-spelling==8.0.0
# via -r doc/requirements.in
starlette==0.37.2
# via sphinx-autobuild
stevedore==5.2.0
# via doc8
tornado==6.4
# via livereload
urllib3==2.2.1
# via requests
uvicorn==0.29.0
# via sphinx-autobuild
watchfiles==0.21.0
# via sphinx-autobuild
websockets==12.0
# via sphinx-autobuild
16 changes: 8 additions & 8 deletions requirements/dev.pip
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ astroid==3.1.0
# via pylint
attrs==23.2.0
# via hypothesis
backports-tarfile==1.1.0
backports-tarfile==1.1.1
# via jaraco-context
build==1.2.1
# via check-manifest
Expand Down Expand Up @@ -49,7 +49,7 @@ flaky==3.8.1
# via -r requirements/pytest.in
greenlet==3.0.3
# via -r requirements/dev.in
hypothesis==6.100.1
hypothesis==6.100.2
# via -r requirements/pytest.in
idna==3.7
# via requests
Expand All @@ -72,7 +72,7 @@ jaraco-functools==4.0.1
# via keyring
jedi==0.19.1
# via pudb
keyring==25.1.0
keyring==25.2.0
# via twine
libsass==0.23.0
# via -r requirements/dev.in
Expand All @@ -99,7 +99,7 @@ parso==0.8.4
# via jedi
pkginfo==1.10.0
# via twine
platformdirs==4.2.0
platformdirs==4.2.1
# via
# pylint
# tox
Expand All @@ -122,7 +122,7 @@ pyproject-api==1.6.1
# via tox
pyproject-hooks==1.0.0
# via build
pytest==8.1.1
pytest==8.2.0
# via
# -r requirements/pytest.in
# pytest-xdist
Expand Down Expand Up @@ -158,7 +158,7 @@ tomli==2.0.1
# tox
tomlkit==0.12.4
# via pylint
tox==4.14.2
tox==4.15.0
# via
# -r requirements/tox.in
# tox-gh
Expand All @@ -176,13 +176,13 @@ urllib3==2.2.1
# via
# requests
# twine
urwid==2.6.10
urwid==2.6.11
# via
# pudb
# urwid-readline
urwid-readline==0.14
# via pudb
virtualenv==20.25.3
virtualenv==20.26.0
# via
# -r requirements/pip.in
# tox
Expand Down
2 changes: 1 addition & 1 deletion requirements/kit.pip
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ packaging==24.0
# auditwheel
# build
# cibuildwheel
platformdirs==4.2.0
platformdirs==4.2.1
# via cibuildwheel
pyelftools==0.31
# via auditwheel
Expand Down
6 changes: 3 additions & 3 deletions requirements/mypy.pip
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ execnet==2.1.1
# via pytest-xdist
flaky==3.8.1
# via -r requirements/pytest.in
hypothesis==6.100.1
hypothesis==6.100.2
# via -r requirements/pytest.in
iniconfig==2.0.0
# via pytest
mypy==1.9.0
mypy==1.10.0
# via -r requirements/mypy.in
mypy-extensions==1.0.0
# via mypy
Expand All @@ -30,7 +30,7 @@ pluggy==1.5.0
# via pytest
pygments==2.17.2
# via -r requirements/pytest.in
pytest==8.1.1
pytest==8.2.0
# via
# -r requirements/pytest.in
# pytest-xdist
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.pip
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ distlib==0.3.8
# via virtualenv
filelock==3.13.4
# via virtualenv
platformdirs==4.2.0
platformdirs==4.2.1
# via virtualenv
virtualenv==20.25.3
virtualenv==20.26.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pytest.pip
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ execnet==2.1.1
# via pytest-xdist
flaky==3.8.1
# via -r requirements/pytest.in
hypothesis==6.100.1
hypothesis==6.100.2
# via -r requirements/pytest.in
iniconfig==2.0.0
# via pytest
Expand All @@ -26,7 +26,7 @@ pluggy==1.5.0
# via pytest
pygments==2.17.2
# via -r requirements/pytest.in
pytest==8.1.1
pytest==8.2.0
# via
# -r requirements/pytest.in
# pytest-xdist
Expand Down
6 changes: 3 additions & 3 deletions requirements/tox.pip
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ packaging==24.0
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.2.1
# via
# tox
# virtualenv
Expand All @@ -34,11 +34,11 @@ tomli==2.0.1
# via
# pyproject-api
# tox
tox==4.14.2
tox==4.15.0
# via
# -r requirements/tox.in
# tox-gh
tox-gh==1.3.1
# via -r requirements/tox.in
virtualenv==20.25.3
virtualenv==20.26.0
# via tox

0 comments on commit 796239e

Please sign in to comment.