bump min req to py 3.8

Author: Mikaayenson

.github/workflows/pythonpackage.yml

@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Build 3.X
+name: Build and Test
 
 on:
   push:
@@ -28,9 +28,10 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install wheel setuptools
+        python -m pip install -e ".[lint,test]"
     - name: Lint with flake8
       run: |
-        python setup.py -q lint
+        python -W ignore::DeprecationWarning setup.py -q lint
     - name: Test with pytest
       run: |
-        python setup.py -q test
+        python -W ignore::DeprecationWarning setup.py -q test

.github/workflows/pythonpackage27.yml

@@ -7,9 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 
-* Updated `lark-parser` dependency to `lark>=1.3.1` for Python 3.8+ (migrated from deprecated `lark-parser` package to `lark`)
-* Python < 3.8 continues to use `lark-parser~=0.12.0` for backward compatibility
+* Updated `lark-parser` dependency to `lark>=1.3.1` (migrated from deprecated `lark-parser` package to `lark`)
 * Updated GitHub Actions workflows to use Python 3.8+ and newer action versions
+* Simplified dependencies by removing Python 2.7 and Python < 3.8 compatibility code
+
+### Removed
+
+* **BREAKING**: Dropped support for Python 2.7 and Python < 3.8. The minimum required Python version is now 3.8.
 
 # Version 0.9.19
 

CHANGELOG.md

@@ -13,7 +13,7 @@ Since Endgame [joined forced with Elastic](https://www.elastic.co/blog/endgame-j
 
 # Getting Started
 
-The EQL module current supports Python 2.7 and 3.5+. Assuming a supported Python version is installed, run the command:
+The EQL module requires Python 3.8 or higher. Assuming a supported Python version is installed, run the command:
 
 ```console
 $ pip install eql
@@ -23,7 +23,7 @@ If Python is configured and already in the PATH, then ``eql`` will be readily av
 
 ```console
 $ eql --version
-eql 0.9
+eql 0.9.20
 ```
 
 From there, try a [sample json file](docs/_static/example.json) and test it with EQL.

README.md

@@ -8,38 +8,24 @@
 import io
 
 from setuptools import setup, Command
-from setuptools.command.test import test as TestCommand
 
 
 with io.open('eql/__init__.py', 'rt', encoding='utf8') as f:
     __version__ = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
 
 install_requires = [
-    "lark>=1.3.1; python_version>='3.8'",
-    "lark-parser~=0.12.0; python_version<'3.8'",
-    "enum34; python_version<'3.4'",
-    "ipaddress; python_version<'3'",
+    "lark>=1.3.1",
 ]
 
 test_requires = [
-    "mock~=1.3.0",
     "pytest~=3.8.2",
     "pytest-cov==2.4",
-    "flake8==2.5.1; python_version<'3.8'",
-    "flake8>=3.8.0; python_version>='3.8'",
+    "flake8>=3.8.0",
     "pep257==0.7.0",
     "coverage==4.5.3",
-    "flake8-pep257==1.0.5; python_version<'3.8'",
-    "flake8-docstrings>=1.5.0; python_version>='3.8'",
-    "PyYAML<6.0; python_version<'3.4'",
-    "PyYAML; python_version>='3.4'",
+    "flake8-docstrings>=1.5.0",
+    "PyYAML",
     "toml~=0.10",
-    "pluggy==1.0.0-dev0; python_version<'3.4'",
-    "configparser<5.0; python_version<'3.4'",
-    "contextlib2~=0.6.0",
-    "more-itertools~=5.0; python_version<'3.4'",
-    "importlib-metadata<3.0; python_version<'3.4'",
-    "zipp<1.0; python_version<'3.4'",
     "attrs==21.4.0"
 ]
 etc_files = [os.path.relpath(fn, 'eql') for fn in glob.glob('eql/etc/*') if not fn.endswith('.py')]
@@ -59,42 +45,32 @@ def finalize_options(self):
 
     def run(self):
         """Run the flake8 linter."""
-        self.distribution.fetch_build_eggs(test_requires)
-        self.distribution.packages.append('tests')
-
-        # Handle different flake8 API versions
-        try:
-            # Old flake8 API (2.x)
-            from flake8.main import Flake8Command
-            flake8cmd = Flake8Command(self.distribution)
-            flake8cmd.options_dict = {}
-            flake8cmd.run()
-        except ImportError:
-            # New flake8 API (3.x+)
-            import subprocess
-            # Run flake8 via command line (respects setup.cfg configuration)
-            result = subprocess.run(
-                [sys.executable, '-m', 'flake8', 'eql', 'tests'],
-                cwd=os.path.dirname(os.path.abspath(__file__))
-            )
-            sys.exit(result.returncode)
-
-
-class Test(TestCommand):
+        import subprocess
+        # Run flake8 via command line (respects setup.cfg configuration)
+        result = subprocess.run(
+            [sys.executable, '-m', 'flake8', 'eql', 'tests'],
+            cwd=os.path.dirname(os.path.abspath(__file__))
+        )
+        sys.exit(result.returncode)
+
+
+class Test(Command):
     """Use pytest (http://pytest.org/latest/) in place of the standard unittest library."""
 
     user_options = [("pytest-args=", "a", "Arguments to pass to pytest")]
 
     def initialize_options(self):
-        """Need to ensure pytest_args exists."""
-        TestCommand.initialize_options(self)
+        """Initialize options."""
         self.pytest_args = []
 
-    def run_tests(self):
+    def finalize_options(self):
+        """Finalize options."""
+        pass
+
+    def run(self):
         """Run pytest."""
         import pytest
         import eql
-
         eql.parser.full_tracebacks = True
         sys.exit(pytest.main(self.pytest_args))
 
@@ -113,19 +89,17 @@ def run_tests(self):
         'Intended Audience :: Science/Research',
         'Intended Audience :: System Administrators',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 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',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
         'Topic :: Database',
         'Topic :: Internet :: Log Analysis',
         'Topic :: Scientific/Engineering :: Information Analysis',
     ],
     url='https://eql.readthedocs.io',
-    tests_require=install_requires + test_requires,
     cmdclass={
         'lint': Lint,
         'test': Test