Merge pull request #36 from nicoddemus/update-required-python

Drop Python 3.6 and 3.7 support

.github/workflows/test.yml

@@ -22,18 +22,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7.7", "3.8", "3.9", "3.10", "3.11"]
-        os: [ubuntu-20.04, macos-latest, windows-latest]
-        exclude:  # Apple Silicon ARM64 does not support Python < v3.8
-          - python-version: "3.6"
-            os: macos-latest
-          - python-version: "3.7.7"
-            os: macos-latest
-        include:  # So run those legacy versions on Intel CPUs
-          - python-version: "3.6"
-            os: macos-13
-          - python-version: "3.7.7"
-            os: macos-13
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v4

CHANGELOG.rst

@@ -1,2 +1,4 @@
-Next Release
+CHANGELOG
 ============
+
+See `Releases <https://github.com/pytest-dev/nose2pytest/releases>`__ for the changelog of each version.

nose2pytest/script.py

@@ -107,29 +107,22 @@ def decorator(func):
 
 py_grammar_symbols = pygram.python_grammar.symbol2number
 
-# the first item of each triplet below is a number generated by the grammar driver, so depends on
-# version of Python used to run the script; they are used by has_weak_op_for_comparison(), put breakpoint
-# at "if symbol":
-if sys.version_info.minor in [5, 6, 7, 8, 9, 10, 11]:
-    GRAM_SYM = py_grammar_symbols['comparison']
-    COMP_OP = py_grammar_symbols['comp_op']
-    MEMBERSHIP_SYMBOLS = (
-        (GRAM_SYM, 1, 'in'),
-        (GRAM_SYM, COMP_OP, 'not in')
-    )
-    IDENTITY_SYMBOLS = (
-        (GRAM_SYM, 1, 'is'),
-        (GRAM_SYM, COMP_OP, 'is not')
-    )
-    BOOLEAN_OPS = (
-        (py_grammar_symbols['not_test'], 1, 'not'),
-        (py_grammar_symbols['and_test'], 1, 'and'),
-        (py_grammar_symbols['or_test'], 1, 'or')
-    )
-    GENERATOR_TYPE = py_grammar_symbols['argument']
-
-else:
-    raise RuntimeError('nose2pytest must be run using Python 3.5 to 3.11')
+GRAM_SYM = py_grammar_symbols['comparison']
+COMP_OP = py_grammar_symbols['comp_op']
+MEMBERSHIP_SYMBOLS = (
+    (GRAM_SYM, 1, 'in'),
+    (GRAM_SYM, COMP_OP, 'not in')
+)
+IDENTITY_SYMBOLS = (
+    (GRAM_SYM, 1, 'is'),
+    (GRAM_SYM, COMP_OP, 'is not')
+)
+BOOLEAN_OPS = (
+    (py_grammar_symbols['not_test'], 1, 'not'),
+    (py_grammar_symbols['and_test'], 1, 'and'),
+    (py_grammar_symbols['or_test'], 1, 'or')
+)
+GENERATOR_TYPE = py_grammar_symbols['argument']
 
 # these operators require parens around function arg if binop is + or -
 ADD_SUB_GROUP_TOKENS = (

setup.py

@@ -22,12 +22,8 @@
         install_requires=[
             'fissix',
         ],
-        python_requires='>=3.6',
+        python_requires='>=3.8,<3.12',
         classifiers=[
-            # How mature is this project? Common values are
-            #   3 - Alpha
-            #   4 - Beta
-            #   5 - Production/Stable
             'Development Status :: 5 - Production/Stable',
 
             # Indicate who your project is intended for
@@ -38,8 +34,6 @@
             'License :: OSI Approved :: BSD License',
 
             # Specify the Python versions you support here.
-            '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',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36, 37, 38, 39, 310, 311}
+envlist = py{38, 39, 310, 311}
 
 [testenv]
 deps =