From 79f0ba00660e3ddd3adf46fa696f8346aa56b0b9 Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Thu, 16 Mar 2023 15:42:46 +0000 Subject: [PATCH 1/3] Remove ReturnWithArgsInsideGenerator since it has been removed in pyflakes 2.5 and it is not necessary with python >=3 --- pyqode/python/backend/workers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyqode/python/backend/workers.py b/pyqode/python/backend/workers.py index 6ff02c27..0171d053 100644 --- a/pyqode/python/backend/workers.py +++ b/pyqode/python/backend/workers.py @@ -176,7 +176,6 @@ def run_pep8(request_data): PYFLAKES_ERROR_MESSAGES = [ messages.DoctestSyntaxError, - messages.ReturnWithArgsInsideGenerator, messages.UndefinedExport, messages.UndefinedName, messages.UndefinedLocal From f0356dbdf6d967c66ad098cdfe25e59def4935dc Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Thu, 16 Mar 2023 15:48:27 +0000 Subject: [PATCH 2/3] Drop support for python 2.7 and update classifiers --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0af39ce7..061682a8 100644 --- a/setup.py +++ b/setup.py @@ -76,6 +76,7 @@ def readme(): author_email='colin.duquesnoy@gmail.com', description=DESCRIPTION, long_description=readme(), + python_requires='~=3.2', install_requires=requirements, tests_require=['pytest-cov', 'pytest-pep8', 'pytest'], entry_points={'pyqode_plugins': @@ -91,13 +92,15 @@ def readme(): 'License :: OSI Approved :: MIT License', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX :: Linux', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.2', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Topic :: Software Development :: Libraries :: Application Frameworks', 'Topic :: Software Development :: Widget Sets', 'Topic :: Text Editors :: Integrated Development Environments (IDE)' From 9bfca7a0154165da69edc30606a3a0cd10e37f2b Mon Sep 17 00:00:00 2001 From: Eric Prestat Date: Thu, 16 Mar 2023 17:29:44 +0000 Subject: [PATCH 3/3] Fix reading version during installation --- setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 061682a8..34d91530 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,6 @@ """ import sys from setuptools import setup, find_packages -from pyqode.python import __version__ from setuptools.command.test import test as TestCommand # @@ -21,6 +20,11 @@ cmdclass = {} +version = {} +with open("pyqode/python/__init__.py") as f: + exec(f.read(), version) + + class PyTest(TestCommand): user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")] @@ -66,7 +70,7 @@ def readme(): setup( name='pyqode.python', namespace_packages=['pyqode'], - version=__version__, + version=version['__version__'], packages=[p for p in find_packages() if 'test' not in p], keywords=["CodeEdit PySide PyQt code editor widget python"], package_dir={'pyqode': 'pyqode'},