Skip to content

Commit

Permalink
Merge remote-tracking branch 'pallets/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@northernSage
northernSage committed Feb 11, 2024
2 parents 8bf41a8 + bf1f8fd commit d0ced59
Show file tree
Hide file tree
Showing 16 changed files with 133 additions and 119 deletions.
15 changes: 0 additions & 15 deletions .github/workflows/lock.yaml
View file

This file was deleted.

15 changes: 4 additions & 11 deletions .github/workflows/tests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,17 @@ jobs:
fail-fast: false
matrix:
include:
- {name: Linux, python: '3.9', os: ubuntu-latest, tox: py39}
- {name: Mac, python: '3.9', os: macos-latest, tox: py39}
- {name: Linux, python: '3.11', os: ubuntu-latest, tox: py311}
- {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
- {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}
- {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
- {name: '3.10', python: '3.10', os: ubuntu-latest, tox: py310}
- {name: Typing, python: '3.9', os: ubuntu-latest, tox: typing}
- {name: '3.11', python: '3.11', os: ubuntu-latest, tox: py311}
- {name: Typing, python: '3.12', os: ubuntu-latest, tox: typing}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python }}
- name: install external dependencies Mac
if: matrix.os == 'macos-latest'
run: brew install libmemcached memcached redis
- name: Setup Docker on macOS
if: matrix.os == 'macos-latest'
uses: docker-practice/actions-setup-docker@master
timeout-minutes: 12
- name: install external dependencies Linux
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,9 @@ htmlcov/
.xprocess
.vscode
.python-version
/.idea/.gitignore
/.idea/cachelib.iml
/.idea/misc.xml
/.idea/modules.xml
/.idea/inspectionProfiles/profiles_settings.xml
/.idea/vcs.xml
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ ci:
autoupdate_schedule: monthly
repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
rev: v3.15.0
hooks:
- id: pyupgrade
args: ["--py37-plus"]
- repo: https://github.com/asottile/reorder_python_imports
rev: v3.9.0
- repo: https://github.com/asottile/reorder-python-imports
rev: v3.12.0
hooks:
- id: reorder-python-imports
args: ["--application-directories", "src"]
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 24.1.1
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8
additional_dependencies:
- flake8-bugbear
- flake8-implicit-str-concat
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: fix-byte-order-marker
- id: trailing-whitespace
Expand Down
4 changes: 4 additions & 0 deletions .readthedocs.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
version: 2
build:
os: ubuntu-22.04
tools:
python: "3.10"
python:
install:
- requirements: requirements/docs.txt
Expand Down
89 changes: 49 additions & 40 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,142 +6,142 @@
#
alabaster==0.7.12
# via sphinx
async-timeout==4.0.2
async-timeout==4.0.3
# via redis
attrs==21.2.0
# via pytest
babel==2.9.1
# via sphinx
boto3==1.26.104
boto3==1.34.38
# via -r tests.in
botocore==1.29.104
botocore==1.34.38
# via
# boto3
# s3transfer
build==0.8.0
# via pip-tools
cachetools==5.3.0
cachetools==5.3.2
# via tox
certifi==2022.12.7
certifi==2023.7.22
# via requests
cffi==1.15.1
# via cryptography
cfgv==3.3.1
# via pre-commit
chardet==5.1.0
chardet==5.2.0
# via tox
charset-normalizer==2.0.7
# via requests
click==8.0.3
# via pip-tools
colorama==0.4.6
# via tox
cryptography==39.0.1
cryptography==42.0.0
# via
# types-pyopenssl
# types-redis
distlib==0.3.6
distlib==0.3.7
# via virtualenv
docutils==0.18.1
# via
# sphinx
# sphinx-tabs
filelock==3.10.0
exceptiongroup==1.2.0
# via pytest
filelock==3.13.1
# via
# tox
# virtualenv
identify==2.3.3
# via pre-commit
idna==3.3
# via requests
imagesize==1.2.0
imagesize==1.4.1
# via sphinx
importlib-metadata==6.8.0
# via sphinx
iniconfig==1.1.1
# via pytest
jinja2==3.0.2
jinja2==3.1.3
# via sphinx
jmespath==1.0.1
# via
# boto3
# botocore
markupsafe==2.0.1
# via jinja2
mypy==1.1.1
mypy==1.8.0
# via -r typing.in
mypy-extensions==1.0.0
# via mypy
nodeenv==1.6.0
# via pre-commit
packaging==23.0
packaging==23.2
# via
# build
# pallets-sphinx-themes
# pyproject-api
# pytest
# sphinx
# tox
pallets-sphinx-themes==2.0.3
pallets-sphinx-themes==2.1.1
# via -r docs.in
pep517==0.12.0
# via build
pip-tools==6.12.3
pip-tools==7.3.0
# via -r dev.in
platformdirs==3.1.1
platformdirs==4.2.0
# via
# tox
# virtualenv
pluggy==1.0.0
pluggy==1.3.0
# via
# pytest
# tox
pre-commit==3.2.1
pre-commit==3.6.0
# via -r dev.in
psutil==5.8.0
# via pytest-xprocess
py==1.10.0
# via pytest-xprocess
pycparser==2.21
# via cffi
pygments==2.10.0
pygments==2.15.0
# via
# sphinx
# sphinx-tabs
pylibmc==1.6.3
# via -r tests.in
pyproject-api==1.5.1
pyproject-api==1.6.1
# via tox
pytest==7.2.2
pytest==8.0.0
# via
# -r tests.in
# pytest-xprocess
pytest-xprocess==0.22.2
pytest-xprocess==0.23.0
# via -r tests.in
python-dateutil==2.8.2
# via botocore
pytz==2021.3
# via babel
pyyaml==6.0
# via pre-commit
redis==4.5.1
redis==5.0.1
# via -r tests.in
requests==2.26.0
requests==2.31.0
# via sphinx
s3transfer==0.6.0
s3transfer==0.10.0
# via boto3
six==1.16.0
# via python-dateutil
snowballstemmer==2.1.0
# via sphinx
sphinx==5.1.1
sphinx==7.2.6
# via
# -r docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinx-tabs
# sphinxcontrib-log-cabinet
sphinx-issues==3.0.1
sphinx-issues==4.0.0
# via -r docs.in
sphinx-tabs==3.4.1
sphinx-tabs==3.4.5
# via -r docs.in
sphinxcontrib-applehelp==1.0.2
# via sphinx
Expand All @@ -155,30 +155,39 @@ sphinxcontrib-log-cabinet==1.0.1
# via -r docs.in
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
tomli==2.0.1
# via pep517
tox==4.4.8
# via
# build
# mypy
# pep517
# pip-tools
# pyproject-api
# pytest
# tox
tox==4.12.1
# via -r dev.in
types-pyopenssl==23.0.0.2
# via types-redis
types-redis==4.5.4.1
types-redis==4.6.0.20240106
# via -r typing.in
typing-extensions==3.10.0.2
typing-extensions==4.8.0
# via mypy
urllib3==1.26.7
urllib3==1.26.18
# via
# botocore
# requests
uwsgi==2.0.21
uwsgi==2.0.23
# via -r tests.in
virtualenv==20.21.0
virtualenv==20.25.0
# via
# pre-commit
# tox
wheel==0.38.1
# via pip-tools
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
26 changes: 15 additions & 11 deletions requirements/docs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ alabaster==0.7.12
# via sphinx
babel==2.9.1
# via sphinx
certifi==2022.12.7
certifi==2023.7.22
# via requests
charset-normalizer==2.0.7
# via requests
Expand All @@ -18,40 +18,42 @@ docutils==0.18.1
# sphinx-tabs
idna==3.3
# via requests
imagesize==1.2.0
imagesize==1.4.1
# via sphinx
jinja2==3.0.2
importlib-metadata==7.0.1
# via sphinx
jinja2==3.1.3
# via sphinx
markupsafe==2.0.1
# via jinja2
packaging==21.2
# via
# pallets-sphinx-themes
# sphinx
pallets-sphinx-themes==2.0.3
pallets-sphinx-themes==2.1.1
# via -r docs.in
pygments==2.10.0
pygments==2.15.0
# via
# sphinx
# sphinx-tabs
pyparsing==2.4.7
# via packaging
pytz==2021.3
# via babel
requests==2.26.0
requests==2.31.0
# via sphinx
snowballstemmer==2.1.0
# via sphinx
sphinx==5.1.1
sphinx==7.2.6
# via
# -r docs.in
# pallets-sphinx-themes
# sphinx-issues
# sphinx-tabs
# sphinxcontrib-log-cabinet
sphinx-issues==3.0.1
sphinx-issues==4.0.0
# via -r docs.in
sphinx-tabs==3.4.1
sphinx-tabs==3.4.5
# via -r docs.in
sphinxcontrib-applehelp==1.0.2
# via sphinx
Expand All @@ -65,7 +67,9 @@ sphinxcontrib-log-cabinet==1.0.1
# via -r docs.in
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==1.1.10
# via sphinx
urllib3==1.26.7
urllib3==1.26.18
# via requests
zipp==3.17.0
# via importlib-metadata
Loading

0 comments on commit d0ced59

Please sign in to comment.