Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get 'tox -e lint' woking again #304

Merged
merged 2 commits into from
May 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ create-wheel = no

[flake8]
doctests = 1
ignore =
# module level import not at top of file: we are avoiding cycles
E402,
# import not used: we are publishing APIs, at least from __init__.py
F401,
# line break after binary operator
W504

[check-manifest]
ignore =
Expand Down
103 changes: 51 additions & 52 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,56 +94,55 @@ def read(*rnames):


long_description = (
read('README.rst')
+ '\n' +
read('CHANGES.rst')
)

setup(name='zope.interface',
version='6.5.dev0',
url='https://github.com/zopefoundation/zope.interface',
license='ZPL 2.1',
description='Interfaces for Python',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
long_description=long_description,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Zope Public License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Framework :: Zope :: 3",
"Topic :: Software Development :: Libraries :: Python Modules",
],
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=["zope"],
cmdclass={
'build_ext': optional_build_ext,
},
test_suite='zope.interface.tests',
include_package_data=True,
zip_safe=False,
tests_require=tests_require,
install_requires=['setuptools'],
python_requires='>=3.7',
extras_require={
'docs': ['Sphinx',
'repoze.sphinx.autointerface',
'sphinx_rtd_theme'],
'test': tests_require,
'testing': testing_extras,
},
ext_modules=ext_modules,
keywords=['interface', 'components', 'plugins'],
read('README.rst') + '\n' + read('CHANGES.rst')
)

setup(
name='zope.interface',
version='6.5.dev0',
url='https://github.com/zopefoundation/zope.interface',
license='ZPL 2.1',
description='Interfaces for Python',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
long_description=long_description,
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: Zope Public License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
"Framework :: Zope :: 3",
"Topic :: Software Development :: Libraries :: Python Modules",
],
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=["zope"],
cmdclass={
'build_ext': optional_build_ext,
},
test_suite='zope.interface.tests',
include_package_data=True,
zip_safe=False,
tests_require=tests_require,
install_requires=['setuptools'],
python_requires='>=3.7',
extras_require={
'docs': ['Sphinx',
'repoze.sphinx.autointerface',
'sphinx_rtd_theme'],
'test': tests_require,
'testing': testing_extras,
},
ext_modules=ext_modules,
keywords=['interface', 'components', 'plugins'],
)
2 changes: 1 addition & 1 deletion src/zope/interface/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def meth(arg1, arg2):
_wire()
del _wire

from zope.interface.declarations import Declaration
from zope.interface.declarations import Declaration # isort: skip
# The following are to make spec pickles cleaner
from zope.interface.declarations import Provides
from zope.interface.declarations import alsoProvides
Expand Down
5 changes: 3 additions & 2 deletions src/zope/interface/_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _normalize_name(name):
return name
raise TypeError("name must be a string or ASCII-only bytes")


PYPY = hasattr(sys, 'pypy_version_info')


Expand Down Expand Up @@ -57,7 +58,7 @@ def _c_optimizations_available():
try:
from zope.interface import _zope_interface_coptimizations as c_opt
return c_opt
except catch: # pragma: no cover (only Jython doesn't build extensions)
except catch: # pragma: no cover (only Jython doesn't build extensions)
return False


Expand Down Expand Up @@ -120,7 +121,7 @@ def find_impl():
return py_impl

c_opt = _c_optimizations_available()
if not c_opt: # pragma: no cover (only Jython doesn't build extensions)
if not c_opt: # pragma: no cover (Jython doesn't build extensions)
return py_impl

__traceback_info__ = c_opt
Expand Down
2 changes: 1 addition & 1 deletion src/zope/interface/_flatten.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def _flatten(implements, include_None=0):
r = implements.flattened()
except AttributeError:
if implements is None:
r=()
r = ()
else:
r = Declaration(implements).flattened()

Expand Down
Loading
Loading