diff options
| author | Michael Merickel <michael@merickel.org> | 2024-01-27 15:58:45 -0700 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2024-01-27 15:58:45 -0700 |
| commit | 44be88382f258430b6bb19c318ed93a72ca677c9 (patch) | |
| tree | 5f5ae20ecd6ba09cc77099b073a5bc5c70a88ebb | |
| parent | 3c92e82898fec7870083736c0fb960336b4852b9 (diff) | |
| download | pyramid-44be88382f258430b6bb19c318ed93a72ca677c9.tar.gz pyramid-44be88382f258430b6bb19c318ed93a72ca677c9.tar.bz2 pyramid-44be88382f258430b6bb19c318ed93a72ca677c9.zip | |
upgrade black and sync versions with ``tox -e format``
| -rw-r--r-- | pyproject.toml | 2 | ||||
| -rw-r--r-- | src/pyramid/httpexceptions.py | 1 | ||||
| -rw-r--r-- | src/pyramid/resource.py | 1 | ||||
| -rw-r--r-- | src/pyramid/scripts/pshell.py | 6 | ||||
| -rw-r--r-- | tox.ini | 6 |
5 files changed, 9 insertions, 7 deletions
diff --git a/pyproject.toml b/pyproject.toml index 9069096f7..e5beb1e70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta" [tool.black] line-length = 79 skip-string-normalization = true -target-version = ['py37', 'py38', 'py39', 'py310'] +target-version = ['py37', 'py38', 'py39', 'py310', 'py311', 'py312'] exclude = ''' /( \.git diff --git a/src/pyramid/httpexceptions.py b/src/pyramid/httpexceptions.py index 9d61acd8f..46589b1ec 100644 --- a/src/pyramid/httpexceptions.py +++ b/src/pyramid/httpexceptions.py @@ -129,6 +129,7 @@ redirections that require a ``Location`` field. Reflecting this, these subclasses have one additional keyword argument: ``location``, which indicates the location to which to redirect. """ + import json from string import Template from webob import html_escape as _html_escape diff --git a/src/pyramid/resource.py b/src/pyramid/resource.py index 8ddf4c447..a89395f18 100644 --- a/src/pyramid/resource.py +++ b/src/pyramid/resource.py @@ -1,4 +1,5 @@ """ Backwards compatibility shim module (forever). """ + from pyramid.asset import * # noqa b/w compat resolve_resource_spec = resolve_asset_spec # noqa diff --git a/src/pyramid/scripts/pshell.py b/src/pyramid/scripts/pshell.py index 09baf1736..f80509fa8 100644 --- a/src/pyramid/scripts/pshell.py +++ b/src/pyramid/scripts/pshell.py @@ -162,9 +162,9 @@ class PShellCommand: env_help['root'] = 'Root of the default resource tree.' env_help['registry'] = 'Active Pyramid registry.' env_help['request'] = 'Active request object.' - env_help[ - 'root_factory' - ] = 'Default root factory used to create `root`.' + env_help['root_factory'] = ( + 'Default root factory used to create `root`.' + ) # load the pshell section of the ini file env.update(self.loaded_objects) @@ -33,7 +33,7 @@ commands = twine check dist/* deps = flake8~=6.1.0 - black~=23.11.0 + black~=24.1.0 isort~=5.12 build check-manifest @@ -72,8 +72,8 @@ commands = isort src/pyramid tests setup.py black src/pyramid tests setup.py deps = - black~=22.12.0 - isort~=5.10 + black~=24.1.0 + isort~=5.12 [testenv:build] skip_install = true |