Merge pull request #2066 from davidhalter/ci

Upgrade test runners, Mypy and flake8

.github/workflows/ci.yml

@@ -6,9 +6,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019]
+        os: [ubuntu-24.04, windows-2022]
-        python-version: ["3.13", "3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"]
+        python-version: ["3.13", "3.12", "3.11", "3.10", "3.9", "3.8"]
-        environment: ['3.8', '3.13', '3.12', '3.11', '3.10', '3.9', '3.7', '3.6', 'interpreter']
+        environment: ['3.8', '3.13', '3.12', '3.11', '3.10', '3.9', 'interpreter']
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
           JEDI_TEST_ENVIRONMENT: ${{ matrix.environment }}
 
   code-quality:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
           python -m mypy jedi sith.py setup.py
 
   coverage:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

.readthedocs.yml

@@ -10,7 +10,12 @@ python:
 submodules:
   include: all
 
+sphinx:
+  configuration: docs/conf.py
+
 build:
   os: ubuntu-22.04
   tools:
     python: "3.11"
+  apt_packages:
+    - graphviz

README.rst

@@ -2,6 +2,9 @@
 Jedi - an awesome autocompletion, static analysis and refactoring library for Python
 ####################################################################################
 
+**I released the successor to Jedi: A
+Mypy-Compatible Python Language Server Built in Rust** - `ZubanLS <https://zubanls.com>`_
+
 .. image:: http://isitmaintained.com/badge/open/davidhalter/jedi.svg
     :target: https://github.com/davidhalter/jedi/issues
     :alt: The percentage of open issues and pull requests
@@ -10,7 +13,7 @@ Jedi - an awesome autocompletion, static analysis and refactoring library for Py
     :target: https://github.com/davidhalter/jedi/issues
     :alt: The resolution time is the median time an issue or pull request stays open.
 
-.. image:: https://github.com/davidhalter/jedi/workflows/ci/badge.svg?branch=master
+.. image:: https://github.com/davidhalter/jedi/actions/workflows/ci.yml/badge.svg?branch=master
     :target: https://github.com/davidhalter/jedi/actions
     :alt: Tests
 
@@ -99,7 +102,7 @@ Features and Limitations
 Jedi's features are listed here:
 `Features <https://jedi.readthedocs.org/en/latest/docs/features.html>`_.
 
-You can run Jedi on Python 3.6+ but it should also
+You can run Jedi on Python 3.8+ but it should also
 understand code that is older than those versions. Additionally you should be
 able to use `Virtualenvs <https://jedi.readthedocs.org/en/latest/docs/api.html#environments>`_
 very well.

docs/docs/features.rst

@@ -16,7 +16,7 @@ Jedi's main API calls and features are:
 Basic Features
 --------------
 
-- Python 3.6+ support
+- Python 3.8+ support
 - Ignores syntax errors and wrong indentation
 - Can deal with complex module / function / class structures
 - Great ``virtualenv``/``venv`` support

jedi/api/completion.py

@@ -683,14 +683,14 @@ def search_in_module(inference_state, module_context, names, wanted_names,
 def extract_imported_names(node):
     imported_names = []
 
-    if node.type in ['import_as_names', 'dotted_as_names', 'import_as_name']:
+    if node.type in ['import_as_names', 'dotted_as_names', 'dotted_as_name', 'import_as_name']:
         for index, child in enumerate(node.children):
             if child.type == 'name':
-                if (index > 0 and node.children[index - 1].type == "keyword"
+                if (index > 1 and node.children[index - 1].type == "keyword"
                         and node.children[index - 1].value == "as"):
                     continue
                 imported_names.append(child.value)
-            elif child.type == 'import_as_name':
+            elif child.type in ('import_as_name', 'dotted_as_name'):
                 imported_names.extend(extract_imported_names(child))
 
     return imported_names

jedi/api/environment.py

@@ -22,7 +22,7 @@ if TYPE_CHECKING:
 
 _VersionInfo = namedtuple('VersionInfo', 'major minor micro')  # type: ignore[name-match]
 
-_SUPPORTED_PYTHONS = ['3.13', '3.12', '3.11', '3.10', '3.9', '3.8', '3.7', '3.6']
+_SUPPORTED_PYTHONS = ['3.13', '3.12', '3.11', '3.10', '3.9', '3.8']
 _SAFE_PATHS = ['/usr/bin', '/usr/local/bin']
 _CONDA_VAR = 'CONDA_PREFIX'
 _CURRENT_VERSION = '%s.%s' % (sys.version_info.major, sys.version_info.minor)

jedi/cache.py

@@ -28,7 +28,7 @@ def clear_time_caches(delete_all: bool = False) -> None:
     :param delete_all: Deletes also the cache that is normally not deleted,
         like parser cache, which is important for faster parsing.
     """
-    global _time_caches
+    global _time_caches  # noqa: F824
 
     if delete_all:
         for cache in _time_caches.values():

jedi/debug.py

@@ -21,7 +21,7 @@ try:
         raise ImportError
     else:
         # Use colorama for nicer console output.
-        from colorama import Fore, init  # type: ignore[import]
+        from colorama import Fore, init  # type: ignore[import, unused-ignore]
         from colorama import initialise
 
         def _lazy_colorama_init():  # noqa: F811

jedi/inference/__init__.py

@@ -122,14 +122,14 @@ class InferenceState:
         return value_set
 
     # mypy doesn't suppport decorated propeties (https://github.com/python/mypy/issues/1362)
-    @property  # type: ignore[misc]
+    @property
     @inference_state_function_cache()
     def builtins_module(self):
         module_name = 'builtins'
         builtins_module, = self.import_module((module_name,), sys_path=[])
         return builtins_module
 
-    @property  # type: ignore[misc]
+    @property
     @inference_state_function_cache()
     def typing_module(self):
         typing_module, = self.import_module(('typing',))

jedi/inference/compiled/subprocess/__main__.py

@@ -3,10 +3,6 @@ import sys
 from importlib.abc import MetaPathFinder
 from importlib.machinery import PathFinder
 
-# Remove the first entry, because it's simply a directory entry that equals
-# this directory.
-del sys.path[0]
-
 
 def _get_paths():
     # Get the path to jedi.

jedi/inference/docstrings.py

@@ -48,7 +48,7 @@ def _get_numpy_doc_string_cls():
     global _numpy_doc_string_cache
     if isinstance(_numpy_doc_string_cache, (ImportError, SyntaxError)):
         raise _numpy_doc_string_cache
-    from numpydoc.docscrape import NumpyDocString  # type: ignore[import]
+    from numpydoc.docscrape import NumpyDocString  # type: ignore[import, unused-ignore]
     _numpy_doc_string_cache = NumpyDocString
     return _numpy_doc_string_cache
 
@@ -109,7 +109,7 @@ def _expand_typestr(type_str):
         yield type_str.split('of')[0]
     # Check if type has is a set of valid literal values eg: {'C', 'F', 'A'}
     elif type_str.startswith('{'):
-        node = parse(type_str, version='3.7').children[0]
+        node = parse(type_str, version='3.13').children[0]
         if node.type == 'atom':
             for leaf in getattr(node.children[1], "children", []):
                 if leaf.type == 'number':

jedi/inference/imports.py

@@ -480,7 +480,7 @@ def _load_builtin_module(inference_state, import_names=None, sys_path=None):
     if sys_path is None:
         sys_path = inference_state.get_sys_path()
     if not project._load_unsafe_extensions:
-        safe_paths = project._get_base_sys_path(inference_state)
+        safe_paths = set(project._get_base_sys_path(inference_state))
         sys_path = [p for p in sys_path if p in safe_paths]
 
     dotted_name = '.'.join(import_names)

jedi/inference/value/module.py

@@ -80,7 +80,7 @@ class ModuleMixin(SubModuleDictMixin):
     def is_stub(self):
         return False
 
-    @property  # type: ignore[misc]
+    @property
     @inference_state_method_cache()
     def name(self):
         return self._module_name_class(self, self.string_names[-1])
@@ -138,7 +138,7 @@ class ModuleValue(ModuleMixin, TreeValue):
     api_type = 'module'
 
     def __init__(self, inference_state, module_node, code_lines, file_io=None,
-                 string_names=None, is_package=False):
+                 string_names=None, is_package=False) -> None:
         super().__init__(
             inference_state,
             parent_context=None,
@@ -149,7 +149,7 @@ class ModuleValue(ModuleMixin, TreeValue):
             self._path: Optional[Path] = None
         else:
             self._path = file_io.path
-        self.string_names = string_names  # Optional[Tuple[str, ...]]
+        self.string_names: Optional[tuple[str, ...]] = string_names
         self.code_lines = code_lines
         self._is_package = is_package
 

jedi/inference/value/namespace.py

@@ -38,7 +38,7 @@ class ImplicitNamespaceValue(Value, SubModuleDictMixin):
     def get_qualified_names(self):
         return ()
 
-    @property  # type: ignore[misc]
+    @property
     @inference_state_method_cache()
     def name(self):
         string_name = self.py__package__()[-1]

setup.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from typing import cast
 
 from setuptools import setup, find_packages
 from setuptools.depends import get_module_constant
@@ -9,7 +10,7 @@ __AUTHOR__ = 'David Halter'
 __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'
 
 # Get the version from within jedi. It's defined in exactly one place now.
-version = get_module_constant("jedi", "__version__")
+version = cast(str, get_module_constant("jedi", "__version__"))
 
 readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read()
 
@@ -34,7 +35,7 @@ setup(name='jedi',
       keywords='python completion refactoring vim',
       long_description=readme,
       packages=find_packages(exclude=['test', 'test.*']),
-      python_requires='>=3.6',
+      python_requires='>=3.8',
       # Python 3.13 grammars are added to parso in 0.8.4
       install_requires=['parso>=0.8.4,<0.9.0'],
       extras_require={
@@ -48,12 +49,12 @@ setup(name='jedi',
               'attrs',
           ],
           'qa': [
+              # latest version on 2025-06-16
+              'flake8==7.2.0',
               # latest version supporting Python 3.6
-              'flake8==5.0.4',
+              'mypy==1.16',
-              # latest version supporting Python 3.6
-              'mypy==0.971',
               # Arbitrary pins, latest at the time of pinning
-              'types-setuptools==67.2.0.1',
+              'types-setuptools==80.9.0.20250529',
           ],
           'docs': [
               # Just pin all of these.
@@ -94,8 +95,6 @@ setup(name='jedi',
           'License :: OSI Approved :: MIT License',
           'Operating System :: OS Independent',
           'Programming Language :: Python :: 3',
-          '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',

sith.py

@@ -44,7 +44,7 @@ Options:
   --pudb                Launch pudb when error is raised.
 """
 
-from docopt import docopt  # type: ignore[import]
+from docopt import docopt  # type: ignore[import, unused-ignore]
 
 import json
 import os

test/run.py

@@ -134,7 +134,7 @@ TEST_GOTO = 2
 TEST_REFERENCES = 3
 
 
-grammar36 = parso.load_grammar(version='3.6')
+grammar313 = parso.load_grammar(version='3.13')
 
 
 class BaseTestCase(object):
@@ -238,7 +238,7 @@ class IntegrationTestCase(BaseTestCase):
             should_be = set()
             for match in re.finditer('(?:[^ ]+)', correct):
                 string = match.group(0)
-                parser = grammar36.parse(string, start_symbol='eval_input', error_recovery=False)
+                parser = grammar313.parse(string, start_symbol='eval_input', error_recovery=False)
                 parser_utils.move(parser.get_root_node(), self.line_nr)
                 node = parser.get_root_node()
                 module_context = script._get_module_context()
@@ -504,7 +504,7 @@ if __name__ == '__main__':
     if arguments['--env']:
         environment = get_system_environment(arguments['--env'])
     else:
-        # Will be 3.6.
+        # Will be 3.13.
         environment = get_default_environment()
 
     import traceback

test/test_api/test_environment.py

@@ -26,7 +26,7 @@ def test_find_system_environments():
 
 @pytest.mark.parametrize(
     'version',
-    ['3.6', '3.7', '3.8', '3.9']
+    ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 )
 def test_versions(version):
     try:

test/test_inference/test_imports.py

@@ -318,9 +318,14 @@ def test_duplicated_import(Script):
     s = 'from os import path, p'
     assert 'path' not in import_names(s)
     assert 'path' in import_names(s, column=len(s) - 3)
+    assert 'path' in import_names("from os import path")
+    assert 'path' in import_names("from os import chdir, path")
 
-    s = 'import path as pp, p'
+    s = 'import math as mm, m'
-    assert 'path' not in import_names(s)
+    assert 'math' not in import_names(s)
+
+    s = 'import math as os, o'
+    assert 'os' in import_names(s)
 
     s = 'from os import path as pp, p'
     assert 'path' not in import_names(s)

test/test_inference/test_mixed.py

@@ -16,13 +16,13 @@ def test_on_code():
     assert i.infer()
 
 
-def test_generics_without_definition():
+def test_generics_without_definition() -> None:
     # Used to raise a recursion error
     T = TypeVar('T')
 
     class Stack(Generic[T]):
-        def __init__(self):
+        def __init__(self) -> None:
-            self.items = []  # type: List[T]
+            self.items: List[T] = []
 
         def push(self, item):
             self.items.append(item)

test/test_utils.py

@@ -91,7 +91,7 @@ class TestSetupReadline(unittest.TestCase):
         }
         # There are quite a few differences, because both Windows and Linux
         # (posix and nt) libraries are included.
-        assert len(difference) < 30
+        assert len(difference) < 40
 
     def test_local_import(self):
         s = 'import test.test_utils'