Skip to content

Commit

Permalink
Merge branch 'main' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackenmen committed Sep 15, 2024
2 parents cc96635 + 1940634 commit a6f7b03
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 107 deletions.
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ default_language_version:
python: python3.8
repos:
- repo: https://github.com/psf/black
rev: '21.6b0'
rev: '24.8.0'
hooks:
- id: black
- repo: https://github.com/Pierre-Sassoulas/black-disable-checker
rev: '1.0.1'
rev: 'v1.1.3'
hooks:
- id: black-disable-checker
- repo: https://github.com/PyCQA/flake8
rev: '3.9.2'
rev: '7.1.1'
hooks:
- id: flake8
- repo: https://github.com/PyCQA/isort
rev: '5.9.1'
rev: '5.13.2'
hooks:
- id: isort

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.6.0
hooks:
# all files should end with an empty line (for one, it minimizes the diffs)
- id: end-of-file-fixer
Expand Down Expand Up @@ -51,7 +51,7 @@ repos:
- id: check-merge-conflict

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.9.0
rev: v1.10.0
hooks:
- id: python-check-blanket-noqa
- id: python-check-blanket-type-ignore
Expand Down
5 changes: 3 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
version: 2

build:
image: latest
os: ubuntu-22.04
tools:
python: "3.8"

python:
version: 3.8
install:
- requirements: requirements.txt

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ syncenv:
ensurevenv: ;

bumpdeps: ensurevenv
echo.- Upgrading requirement files
@echo "- Upgrading requirement files"
./.venv/bin/pip-compile --quiet --upgrade
./.venv/bin/pip-compile --quiet --upgrade dev-requirements.in
$(MAKE) aftercompiledeps

compiledeps: ensurevenv
echo.- Compiling requirement files
@echo "- Compiling requirement files"
./.venv/bin/pip-compile --quiet
./.venv/bin/pip-compile --quiet dev-requirements.in
$(MAKE) aftercompiledeps
Expand Down
129 changes: 66 additions & 63 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,137 +4,134 @@
#
# pip-compile dev-requirements.in
#
alabaster==0.7.12
alabaster==0.7.13
# via
# -c requirements.txt
# sphinx
appdirs==1.4.4
# via
# black
# virtualenv
babel==2.9.1
babel==2.16.0
# via
# -c requirements.txt
# sphinx
black==21.6b0
black==24.8.0
# via -r dev-requirements.in
certifi==2021.5.30
build==1.2.2
# via pip-tools
certifi==2024.8.30
# via
# -c requirements.txt
# requests
cfgv==3.3.0
cfgv==3.4.0
# via pre-commit
chardet==4.0.0
charset-normalizer==3.3.2
# via
# -c requirements.txt
# requests
click==8.0.1
click==8.1.7
# via
# black
# pip-tools
colorama==0.4.4
# via
# -c requirements.txt
# click
# sphinx
# sphinx-autobuild
distlib==0.3.2
colorama==0.4.6
# via sphinx-autobuild
distlib==0.3.8
# via virtualenv
docutils==0.17.1
docutils==0.20.1
# via
# -c requirements.txt
# sphinx
filelock==3.0.12
filelock==3.16.0
# via virtualenv
flake8==3.9.2
flake8==7.1.1
# via -r dev-requirements.in
identify==2.2.10
identify==2.6.1
# via pre-commit
idna==2.10
idna==3.9
# via
# -c requirements.txt
# requests
imagesize==1.2.0
imagesize==1.4.1
# via
# -c requirements.txt
# sphinx
importlib-metadata==8.5.0
# via
# -c requirements.txt
# build
# sphinx
isort==5.9.1
isort==5.13.2
# via -r dev-requirements.in
jinja2==3.0.1
jinja2==3.1.4
# via
# -c requirements.txt
# sphinx
livereload==2.6.3
livereload==2.7.0
# via sphinx-autobuild
markupsafe==2.0.1
markupsafe==2.1.5
# via
# -c requirements.txt
# jinja2
mccabe==0.6.1
mccabe==0.7.0
# via flake8
mypy-extensions==0.4.3
mypy-extensions==1.0.0
# via black
nodeenv==1.6.0
nodeenv==1.9.1
# via pre-commit
packaging==21.0
packaging==24.1
# via
# -c requirements.txt
# black
# build
# sphinx
pathspec==0.8.1
pathspec==0.12.1
# via black
pep517==0.10.0
# via pip-tools
pip-tools==6.2.0
pip-tools==7.4.1
# via -r dev-requirements.in
pre-commit==2.13.0
platformdirs==4.3.3
# via
# black
# virtualenv
pre-commit==3.5.0
# via -r dev-requirements.in
pycodestyle==2.7.0
pycodestyle==2.12.1
# via flake8
pyflakes==2.3.1
pyflakes==3.2.0
# via flake8
pygments==2.9.0
pygments==2.18.0
# via
# -c requirements.txt
# sphinx
pyparsing==2.4.7
pyproject-hooks==1.1.0
# via
# -c requirements.txt
# packaging
pytz==2021.1
# build
# pip-tools
pytz==2024.2
# via
# -c requirements.txt
# babel
pyyaml==5.4.1
pyyaml==6.0.2
# via pre-commit
regex==2021.7.6
# via black
requests==2.25.1
requests==2.32.3
# via
# -c requirements.txt
# sphinx
six==1.16.0
# via
# livereload
# virtualenv
snowballstemmer==2.1.0
snowballstemmer==2.2.0
# via
# -c requirements.txt
# sphinx
sphinx==4.0.3
sphinx==7.1.2
# via
# -c requirements.txt
# sphinx-autobuild
sphinx-autobuild==2021.3.14
# via -r dev-requirements.in
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-applehelp==1.0.4
# via
# -c requirements.txt
# sphinx
sphinxcontrib-devhelp==1.0.2
# via
# -c requirements.txt
# sphinx
sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-htmlhelp==2.0.1
# via
# -c requirements.txt
# sphinx
Expand All @@ -150,21 +147,27 @@ sphinxcontrib-serializinghtml==1.1.5
# via
# -c requirements.txt
# sphinx
toml==0.10.2
tomli==2.0.1
# via
# black
# pep517
# pre-commit
tornado==6.1
# build
# pip-tools
tornado==6.4.1
# via livereload
urllib3==1.26.6
typing-extensions==4.12.2
# via black
urllib3==2.2.3
# via
# -c requirements.txt
# requests
virtualenv==20.4.7
virtualenv==20.26.4
# via pre-commit
wheel==0.36.2
wheel==0.44.0
# via pip-tools
zipp==3.20.2
# via
# -c requirements.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
Loading

0 comments on commit a6f7b03

Please sign in to comment.