Merge pull request #6 from kavigupta/fix-and-automate-tests

fix and automate tests
kavigupta · Feb 13, 2024 · 0d84efe · 0d84efe
2 parents 53ed11a + bf4bc3e
commit 0d84efe
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 8 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,28 @@
+name: Python package
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest pylint parameterized .
+      - name: Test with pytest
+        run: |
+          pytest tests
+      - name: Lint with pylint
+        run: |
+          # pylint ast_scope setup.py tests
diff --git a/setup.py b/setup.py
@@ -15,10 +15,11 @@
     download_url="https://github.com/kavigupta/ast_scope/archive/0.3.1.zip",
     packages=setuptools.find_packages(exclude=["tests*"]),
     classifiers=[
-        "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",
         "Operating System :: OS Independent",
     ],
     python_requires=">=3.5",

diff --git a/tests/argument_tests.py → tests/argument_test.py b/tests/argument_tests.py → tests/argument_test.py
diff --git a/tests/assignment_tests.py → tests/assignment_test.py b/tests/assignment_tests.py → tests/assignment_test.py
@@ -75,7 +75,7 @@ class ImportAssignmentTests(DisplayAnnotatedTestCase):
     def test_global_import(self):
         self.assertAnnotationWorks(
             """
-            import os
+            import {>=3.10!g}os
             {g}def f():
                 {g}os
             """
@@ -84,31 +84,32 @@ def test_local_import(self):
         self.assertAnnotationWorks(
             """
             {g}def f():
-                import os
+                import {>=3.10!~f@1:0}os
                 {~f@1:0}os
             """
         )
     def test_sub_import(self):
         self.assertAnnotationWorks(
             """
             {g}def f():
-                from os import system
+                from os import {>=3.10!~f@1:0}system
                 {~f@1:0}system
                 {g}os
             """
         )
     def test_star_import(self):
+        # TODO: no annotation in any version
         self.assertAnnotationWorks(
             """
-            from os import *
+            from os import {>=3.10!g}*
             """
         )
     def test_aliases(self):
         self.assertAnnotationWorks(
             """
             {g}def f():
-                from os import system as a
-                import sys as b
+                from os import {>=3.10!~f@1:0}system as a
+                import {>=3.10!~f@1:0}sys as b
                 {g}os
                 {g}system
                 {~f@1:0}a

diff --git a/tests/basic_scope_tests.py → tests/basic_scope_test.py b/tests/basic_scope_tests.py → tests/basic_scope_test.py
diff --git a/tests/class_tests.py → tests/class_test.py b/tests/class_tests.py → tests/class_test.py
diff --git a/tests/comprehension_tests.py → tests/comprehension_test.py b/tests/comprehension_tests.py → tests/comprehension_test.py
diff --git a/tests/dependency_graph_tests.py → tests/dependency_graph_test.py b/tests/dependency_graph_tests.py → tests/dependency_graph_test.py
diff --git a/tests/exception_tests.py → tests/exception_test.py b/tests/exception_tests.py → tests/exception_test.py
diff --git a/tests/function_frame_tests.py → tests/function_frame_test.py b/tests/function_frame_tests.py → tests/function_frame_test.py
diff --git a/tests/nonlocal_tests.py → tests/nonlocal_test.py b/tests/nonlocal_tests.py → tests/nonlocal_test.py
diff --git a/tests/special_symbols_tests.py → tests/special_symbols_test.py b/tests/special_symbols_tests.py → tests/special_symbols_test.py
diff --git a/tests/utils.py b/tests/utils.py
@@ -83,6 +83,8 @@ def all_nodes_gen_for_variables(variables):
     yield from variables.functions
     yield from variables.classes
     yield from variables.import_statements
+    yield from variables.arguments
+    yield from variables.exceptions
 
 def all_nodes_gen_for_scope(scope):
     if hasattr(scope, 'children'):
@@ -99,6 +101,14 @@ def _check_nodes(self, mapping, *scopes):
         self.assertCountEqual([node for _, node in overall_scope], list(mapping))
 
     def assertAnnotationWorks(self, annotated_code, code=None, *, class_binds_near=False):
+        # directives of the form {>version!scope} are removed unless the version is satisfied
+        regex = r"\{>=(\d+\.\d+)!([^\}]+)\}"
+        def replacer(match):
+            version, scope = match.groups()
+            if sys.version_info >= tuple(map(int, version.split("."))):
+                return "{" + scope + "}"
+            return ""
+        annotated_code = re.sub(regex, replacer, annotated_code)
         if code is None:
             code = trim(re.sub(r"\{[^\}]+\}", "", annotated_code))