Skip to content

Commit

Permalink
Bump certifi from 2022.9.24 to 2022.12.7 in /requirements (#121)
Browse files Browse the repository at this point in the history
* Bump certifi from 2022.9.24 to 2022.12.7 in /requirements

Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.9.24 to 2022.12.7.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](certifi/python-certifi@2022.09.24...2022.12.07)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add notes on packages

* Rebump base requirements

* Bump docs requirements

* Add test for docs on py310

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: James Cooke <jamescooke@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and jamescooke committed Dec 14, 2022
1 parent 2744fa0 commit 9255c6f
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 83 deletions.
16 changes: 16 additions & 0 deletions docs/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@ Run all tests and linting using ``tox`` for all versions of Python and Django:
make test
Requirements
------------

Quick info on packages:

* Only requirements for build are ``tox`` and ``tox-gh-actions``, these are
unpinned and installed in ``build.yml`` GitHub Action config.

* For local development, there are base requirements in ``base.txt``. These are
built with Python 3.7.

* For building documentation, there are docs requirements in ``docs.txt``.
These are used by Read The Docs and build with Python 3.10.

Docs and base requirements are split because ``sphinx`` and ``flake8``
currently conflict.

Testing with real Django projects
---------------------------------
Expand Down
126 changes: 67 additions & 59 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,52 +1,60 @@
#
# This file is autogenerated by pip-compile with python 3.6
# To update, run:
# This file is autogenerated by pip-compile with Python 3.7
# by the following command:
#
# pip-compile --output-file=base.txt base.in
#
asttokens==2.0.8
asttokens==2.2.1
# via flake8-aaa
bandit==1.7.1
# via -r base.in
bleach==4.1.0
bleach==5.0.1
# via readme-renderer
build==0.8.0
# via check-manifest
certifi==2022.9.24
build==0.9.0
# via
# check-manifest
# pip-tools
cachetools==5.2.0
# via tox
certifi==2022.12.7
# via requests
cffi==1.15.1
# via cryptography
charset-normalizer==2.0.12
chardet==5.1.0
# via tox
charset-normalizer==2.1.1
# via requests
check-manifest==0.48
check-manifest==0.49
# via -r base.in
click==8.0.4
click==8.1.3
# via pip-tools
colorama==0.4.5
# via twine
cryptography==38.0.1
colorama==0.4.6
# via tox
commonmark==0.9.1
# via rich
cryptography==38.0.4
# via secretstorage
distlib==0.3.6
# via virtualenv
docutils==0.18.1
docutils==0.19
# via
# -r base.in
# readme-renderer
filelock==3.4.1
filelock==3.8.2
# via
# tox
# virtualenv
flake8==3.9.2
# via -r base.in
flake8-aaa==0.12.1
flake8-aaa==0.12.2
# via -r base.in
gitdb==4.0.9
gitdb==4.0.10
# via gitpython
gitpython==3.1.18
gitpython==3.1.29
# via bandit
idna==3.4
# via requests
importlib-metadata==4.8.3
importlib-metadata==5.1.0
# via
# build
# click
Expand All @@ -58,107 +66,107 @@ importlib-metadata==4.8.3
# tox
# twine
# virtualenv
importlib-resources==5.4.0
# via
# tqdm
# virtualenv
isort==5.10.1
# via -r base.in
jeepney==0.7.1
jaraco-classes==3.2.3
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
keyring==23.4.1
keyring==23.11.0
# via twine
mccabe==0.6.1
# via flake8
packaging==21.3
more-itertools==9.0.0
# via jaraco-classes
packaging==22.0
# via
# bleach
# build
# pyproject-api
# tox
pbr==5.10.0
pbr==5.11.0
# via stevedore
pep517==0.13.0
# via
# build
# pip-tools
pip-tools==6.4.0
# via build
pip-tools==6.11.0
# via -r base.in
pkginfo==1.8.3
pkginfo==1.9.2
# via twine
platformdirs==2.4.0
# via virtualenv
platformdirs==2.6.0
# via
# tox
# virtualenv
pluggy==1.0.0
# via tox
py==1.11.0
# via tox
pycodestyle==2.7.0
# via flake8
pycparser==2.21
# via cffi
pyflakes==2.3.1
# via flake8
pygments==2.13.0
# via readme-renderer
pyparsing==3.0.9
# via packaging
# via
# readme-renderer
# rich
pyproject-api==1.2.1
# via tox
pyyaml==6.0
# via
# -r base.in
# bandit
readme-renderer==34.0
readme-renderer==37.3
# via twine
requests==2.27.1
requests==2.28.1
# via
# requests-toolbelt
# twine
requests-toolbelt==0.10.0
requests-toolbelt==0.10.1
# via twine
rfc3986==2.0.0
# via twine
rfc3986==1.5.0
rich==12.6.0
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# asttokens
# bleach
# tox
smmap==5.0.0
# via gitdb
stevedore==3.5.1
stevedore==3.5.2
# via bandit
toml==0.10.2
# via tox
tomli==1.2.3
tomli==2.0.1
# via
# build
# check-manifest
# pep517
tox==3.26.0
# pyproject-api
# tox
tox==4.0.5
# via -r base.in
tqdm==4.64.1
# via twine
twine==3.8.0
twine==4.0.2
# via -r base.in
typing-extensions==4.1.1
typing-extensions==4.4.0
# via
# gitpython
# importlib-metadata
urllib3==1.26.12
# rich
# tox
urllib3==1.26.13
# via
# requests
# twine
virtualenv==20.16.5
virtualenv==20.17.1
# via tox
webencodings==0.5.1
# via bleach
wheel==0.37.1
wheel==0.38.4
# via pip-tools
zipp==3.6.0
zipp==3.11.0
# via
# importlib-metadata
# importlib-resources
# pep517

# The following packages are considered to be unsafe in a requirements file:
Expand Down
36 changes: 14 additions & 22 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#
# This file is autogenerated by pip-compile with python 3.6
# To update, run:
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
# pip-compile --output-file=docs.txt docs.in
#
alabaster==0.7.12
# via sphinx
babel==2.10.3
babel==2.11.0
# via sphinx
certifi==2022.9.24
certifi==2022.12.7
# via requests
charset-normalizer==2.0.12
charset-normalizer==2.1.1
# via requests
colorama==0.4.5
colorama==0.4.6
# via sphinx-autobuild
docutils==0.17.1
# via
Expand All @@ -22,23 +22,19 @@ idna==3.4
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==4.8.3
# via sphinx
jinja2==3.0.3
jinja2==3.1.2
# via sphinx
livereload==2.6.3
# via sphinx-autobuild
markupsafe==2.0.1
markupsafe==2.1.1
# via jinja2
packaging==21.3
packaging==22.0
# via sphinx
pygments==2.13.0
# via sphinx
pyparsing==3.0.9
# via packaging
pytz==2022.5
pytz==2022.6
# via babel
requests==2.27.1
requests==2.28.1
# via sphinx
six==1.16.0
# via livereload
Expand All @@ -51,7 +47,7 @@ sphinx==5.3.0
# sphinx-rtd-theme
sphinx-autobuild==2021.3.14
# via -r docs.in
sphinx-rtd-theme==1.0.0
sphinx-rtd-theme==1.1.1
# via -r docs.in
sphinxcontrib-applehelp==1.0.2
# via sphinx
Expand All @@ -65,11 +61,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
tornado==6.1
tornado==6.2
# via livereload
typing-extensions==4.1.1
# via importlib-metadata
urllib3==1.26.12
urllib3==1.26.13
# via requests
zipp==3.6.0
# via importlib-metadata
8 changes: 6 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
envlist =
py{37,38,39,310,311}-django{22,30,31}
py{37,38,39,310,311}-lint
py310-docs

[testenv]
changedir =
django22: test_framework/django22
django30: test_framework/django30
django31: test_framework/django31
docs: docs
deps =
django22: Django>=2.2,<3
django30: Django>=3.0,<3.1
Expand All @@ -17,10 +19,12 @@ deps =
lint: flake8-aaa
lint: isort
lint: twine
docs: -rrequirements/docs.txt
commands =
!lint: python ../show_versions.py
!lint: python ./manage.py test --settings=djoyproject.test_settings {posargs}
django{22,30,31}: python ../show_versions.py
django{22,30,31}: python ./manage.py test --settings=djoyproject.test_settings {posargs}
lint: make lint
docs: make html
whitelist_externals = make

[gh-actions]
Expand Down

0 comments on commit 9255c6f

Please sign in to comment.