Skip to content

Commit

Permalink
Fix tox lint run.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Howitz committed Aug 4, 2022
1 parent bf0c4bd commit 5db855e
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
- ["3.7", "py37-ip_range"]

runs-on: ${{ matrix.os }}-latest
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ lib64
log/
parts/
pyvenv.cfg
testing.log
var/
2 changes: 1 addition & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "3b712f305ca8207e971c5bf81f2bdb5872489f2f"
commit-id = "92d6b6d157267896ae4098f4d4a5fb55d103319a"

[python]
with-pypy = false
Expand Down
3 changes: 1 addition & 2 deletions src/Products/PluggableAuthService/interfaces/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,8 @@ def enumerateRoles(id=None, exact_match=False, sort_by=None,


class IRequestTypeSniffer(Interface):
"""Given a request, detects request type for later use by other plugins."""

""" Given a request, detects the request type for later use by other plugins.
"""
def sniffRequestType(request):
""" Return a interface identifying what kind the request is.
"""
Expand Down
4 changes: 2 additions & 2 deletions src/Products/PluggableAuthService/plugins/ZODBUserManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,8 @@ def updateEveryLoginName(self, quit_on_first_error=True):
', '.join(errors))

# Make sure we did not lose any users.
assert(len(self._login_to_userid.keys())
== len(new_login_to_userid.keys()))
assert (len(self._login_to_userid.keys())
== len(new_login_to_userid.keys()))
# Empty the main cache.
view_name = createViewName('enumerateUsers')
self.ZCacheable_invalidate(view_name=view_name)
Expand Down
4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ envlist =

[testenv]
skip_install = true
# We need to pin setuptools < 60 until zc.buildout 3.x supports it.
deps =
setuptools < 60
zc.buildout==3.0.0rc2
zc.buildout >= 3.0.0rc3
wheel > 0.37
commands_pre =
py27,py35: {envbindir}/buildout -nc {toxinidir}/buildout4.cfg buildout:directory={envdir} buildout:develop={toxinidir} install test
Expand Down

0 comments on commit 5db855e

Please sign in to comment.