Skip to content

Commit

Permalink
Merge branch '3.1.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
davidism committed Aug 24, 2024
2 parents 7f0fc0a + 3e5b5b2 commit 9949b49
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 66 deletions.
8 changes: 1 addition & 7 deletions requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile build.in
#
build==1.2.1
# via -r build.in
importlib-metadata==8.4.0
# via build
packaging==24.1
# via build
pyproject-hooks==1.1.0
# via build
tomli==2.0.1
# via build
zipp==3.20.0
# via importlib-metadata
40 changes: 10 additions & 30 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile dev.in
#
alabaster==0.7.13
alabaster==1.0.0
# via sphinx
attrs==24.2.0
# via
Expand Down Expand Up @@ -32,12 +32,8 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
docutils==0.20.1
docutils==0.21.2
# via sphinx
exceptiongroup==1.2.2
# via
# pytest
# trio
filelock==3.15.4
# via
# tox
Expand All @@ -50,10 +46,6 @@ idna==3.8
# trio
imagesize==1.4.1
# via sphinx
importlib-metadata==8.4.0
# via
# build
# sphinx
iniconfig==2.0.0
# via pytest
jinja2==3.1.4
Expand Down Expand Up @@ -90,7 +82,7 @@ pluggy==1.5.0
# via
# pytest
# tox
pre-commit==3.5.0
pre-commit==3.8.0
# via -r dev.in
pygments==2.18.0
# via sphinx
Expand All @@ -102,8 +94,6 @@ pyproject-hooks==1.1.0
# pip-tools
pytest==8.3.2
# via -r tests.in
pytz==2024.1
# via babel
pyyaml==6.0.2
# via pre-commit
requests==2.32.3
Expand All @@ -114,36 +104,28 @@ snowballstemmer==2.2.0
# via sphinx
sortedcontainers==2.4.0
# via trio
sphinx==7.1.2
sphinx==8.0.2
# via
# -r docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinxcontrib-log-cabinet
sphinx-issues==4.1.0
# via -r docs.in
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-log-cabinet==1.0.1
# via -r docs.in
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
tomli==2.0.1
# via
# build
# mypy
# pip-tools
# pyproject-api
# pytest
# tox
toposort==1.10
# via pip-compile-multi
tox==4.18.0
Expand All @@ -160,8 +142,6 @@ virtualenv==20.26.3
# tox
wheel==0.44.0
# via pip-tools
zipp==3.20.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
24 changes: 9 additions & 15 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile docs.in
#
alabaster==0.7.13
alabaster==1.0.0
# via sphinx
babel==2.16.0
# via sphinx
certifi==2024.7.4
# via requests
charset-normalizer==3.3.2
# via requests
docutils==0.20.1
docutils==0.21.2
# via sphinx
idna==3.8
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==8.4.0
# via sphinx
jinja2==3.1.4
# via sphinx
markupsafe==2.1.5
Expand All @@ -32,35 +30,31 @@ pallets-sphinx-themes==2.1.3
# via -r docs.in
pygments==2.18.0
# via sphinx
pytz==2024.1
# via babel
requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
# via sphinx
sphinx==7.1.2
sphinx==8.0.2
# via
# -r docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinxcontrib-log-cabinet
sphinx-issues==4.1.0
# via -r docs.in
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-applehelp==2.0.0
# via sphinx
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-htmlhelp==2.1.0
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-log-cabinet==1.0.1
# via -r docs.in
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
urllib3==2.2.2
# via requests
zipp==3.20.0
# via importlib-metadata
8 changes: 1 addition & 7 deletions requirements/tests.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile tests.in
Expand All @@ -8,10 +8,6 @@ attrs==24.2.0
# via
# outcome
# trio
exceptiongroup==1.2.2
# via
# pytest
# trio
idna==3.8
# via trio
iniconfig==2.0.0
Expand All @@ -28,7 +24,5 @@ sniffio==1.3.1
# via trio
sortedcontainers==2.4.0
# via trio
tomli==2.0.1
# via pytest
trio==0.26.2
# via -r tests.in
4 changes: 1 addition & 3 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile typing.in
Expand All @@ -8,7 +8,5 @@ mypy==1.11.1
# via -r typing.in
mypy-extensions==1.0.0
# via mypy
tomli==2.0.1
# via mypy
typing-extensions==4.12.2
# via mypy
4 changes: 0 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ use_frozen_constraints = true
deps = -r requirements/tests.txt
commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs}

[testenv:py37,py3.7]
deps = -r requirements/tests37.txt

[testenv:style]
deps = pre-commit
skip_install = true
Expand All @@ -43,7 +40,6 @@ skip_install = true
commands = pre-commit autoupdate -j4

[testenv:update-requirements]
base_python = 3.8
labels = update
deps = pip-tools
skip_install = true
Expand Down

0 comments on commit 9949b49

Please sign in to comment.