mirror of
https://github.com/davidhalter/django-stubs.git
synced 2025-12-12 15:01:55 +08:00
updated package setup (#485)
* updated package setup * updated to use python 3.9 * fixed test runner * fixed typecheck tests * fixed discrepencies * added override to runner * updated travis * updated pre-commit hooks * updated dep
This commit is contained in:
Na'aman Hirschfeld
committed by
GitHub
GitHub
parent
a3624dec36
commit
44151c485d
@@ -4,30 +4,27 @@ import subprocess
|
||||
import sys
|
||||
from argparse import ArgumentParser
|
||||
from collections import defaultdict
|
||||
from pathlib import Path
|
||||
from typing import Dict, List, Pattern, Tuple, Union
|
||||
from distutils import spawn
|
||||
from typing import Dict, List, Pattern, Union
|
||||
|
||||
from git import RemoteProgress, Repo
|
||||
from scripts.enabled_test_modules import EXTERNAL_MODULES, IGNORED_ERRORS, IGNORED_MODULES, MOCK_OBJECTS
|
||||
from scripts.git_helpers import checkout_django_branch
|
||||
from scripts.paths import DJANGO_SOURCE_DIRECTORY, PROJECT_DIRECTORY
|
||||
|
||||
from scripts.enabled_test_modules import (
|
||||
EXTERNAL_MODULES, IGNORED_ERRORS, IGNORED_MODULES, MOCK_OBJECTS,
|
||||
)
|
||||
|
||||
DJANGO_COMMIT_REFS: Dict[str, Tuple[str, str]] = {
|
||||
'2.2': ('stable/2.2.x', '8093aaa8ff9dd7386a069c6eb49fcc1c5980c033'),
|
||||
'3.0': ('stable/3.0.x', '44da7abda848f05caaed74f6a749038c87dedfda')
|
||||
DJANGO_COMMIT_REFS: Dict[str, str] = {
|
||||
"2.2": "8093aaa8ff9dd7386a069c6eb49fcc1c5980c033",
|
||||
"3.0": "44da7abda848f05caaed74f6a749038c87dedfda",
|
||||
}
|
||||
PROJECT_DIRECTORY = Path(__file__).parent.parent
|
||||
DJANGO_SOURCE_DIRECTORY = PROJECT_DIRECTORY / 'django-sources' # type: Path
|
||||
|
||||
|
||||
def get_unused_ignores(ignored_message_freq: Dict[str, Dict[Union[str, Pattern], int]]) -> List[str]:
|
||||
unused_ignores = []
|
||||
for root_key, patterns in IGNORED_ERRORS.items():
|
||||
for pattern in patterns:
|
||||
if (ignored_message_freq[root_key][pattern] == 0
|
||||
and pattern not in itertools.chain(EXTERNAL_MODULES, MOCK_OBJECTS)):
|
||||
unused_ignores.append(f'{root_key}: {pattern}')
|
||||
if ignored_message_freq[root_key][pattern] == 0 and pattern not in itertools.chain(
|
||||
EXTERNAL_MODULES, MOCK_OBJECTS
|
||||
):
|
||||
unused_ignores.append(f"{root_key}: {pattern}")
|
||||
return unused_ignores
|
||||
|
||||
|
||||
@@ -42,7 +39,7 @@ def is_pattern_fits(pattern: Union[Pattern, str], line: str):
|
||||
|
||||
|
||||
def is_ignored(line: str, test_folder_name: str, *, ignored_message_freqs: Dict[str, Dict[str, int]]) -> bool:
|
||||
if 'runtests' in line:
|
||||
if "runtests" in line:
|
||||
return True
|
||||
|
||||
if test_folder_name in IGNORED_MODULES:
|
||||
@@ -53,83 +50,42 @@ def is_ignored(line: str, test_folder_name: str, *, ignored_message_freqs: Dict[
|
||||
ignored_message_freqs[test_folder_name][pattern] += 1
|
||||
return True
|
||||
|
||||
for pattern in IGNORED_ERRORS['__common__']:
|
||||
for pattern in IGNORED_ERRORS["__common__"]:
|
||||
if is_pattern_fits(pattern, line):
|
||||
ignored_message_freqs['__common__'][pattern] += 1
|
||||
ignored_message_freqs["__common__"][pattern] += 1
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
def replace_with_clickable_location(error: str, abs_test_folder: Path) -> str:
|
||||
raw_path, _, error_line = error.partition(': ')
|
||||
fname, _, line_number = raw_path.partition(':')
|
||||
|
||||
try:
|
||||
path = abs_test_folder.joinpath(fname).relative_to(PROJECT_DIRECTORY)
|
||||
except ValueError:
|
||||
# fail on travis, just show an error
|
||||
return error
|
||||
|
||||
clickable_location = f'./{path}:{line_number or 1}'
|
||||
return error.replace(raw_path, clickable_location)
|
||||
|
||||
|
||||
class ProgressPrinter(RemoteProgress):
|
||||
def line_dropped(self, line: str) -> None:
|
||||
print(line)
|
||||
|
||||
def update(self, op_code, cur_count, max_count=None, message=''):
|
||||
print(self._cur_line)
|
||||
|
||||
|
||||
def get_django_repo_object(branch: str) -> Repo:
|
||||
if not DJANGO_SOURCE_DIRECTORY.exists():
|
||||
DJANGO_SOURCE_DIRECTORY.mkdir(exist_ok=True, parents=False)
|
||||
return Repo.clone_from('https://github.com/django/django.git', DJANGO_SOURCE_DIRECTORY,
|
||||
progress=ProgressPrinter(),
|
||||
branch=branch,
|
||||
depth=100)
|
||||
else:
|
||||
repo = Repo(DJANGO_SOURCE_DIRECTORY)
|
||||
return repo
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == "__main__":
|
||||
parser = ArgumentParser()
|
||||
parser.add_argument('--django_version', choices=['2.2', '3.0'], required=True)
|
||||
args = parser.parse_args()
|
||||
|
||||
# install proper Django version
|
||||
subprocess.check_call([sys.executable, '-m', 'pip', 'install', f'Django=={args.django_version}.*'])
|
||||
|
||||
branch, commit_sha = DJANGO_COMMIT_REFS[args.django_version]
|
||||
repo = get_django_repo_object(branch)
|
||||
if repo.head.commit.hexsha != commit_sha:
|
||||
repo.remote('origin').fetch(branch, progress=ProgressPrinter(), depth=100)
|
||||
repo.git.checkout(commit_sha)
|
||||
|
||||
mypy_config_file = (PROJECT_DIRECTORY / 'scripts' / 'mypy.ini').absolute()
|
||||
mypy_cache_dir = Path(__file__).parent / '.mypy_cache'
|
||||
tests_root = DJANGO_SOURCE_DIRECTORY / 'tests'
|
||||
parser.add_argument("--django_version", default="3.0")
|
||||
django_version = parser.parse_args().django_version
|
||||
subprocess.check_call([sys.executable, "-m", "pip", "install", f"Django=={django_version}.*"])
|
||||
commit_sha = DJANGO_COMMIT_REFS[django_version]
|
||||
repo = checkout_django_branch(django_version, commit_sha)
|
||||
mypy_config_file = (PROJECT_DIRECTORY / "mypy.ini").absolute()
|
||||
mypy_cache_dir = PROJECT_DIRECTORY / ".mypy_cache"
|
||||
tests_root = DJANGO_SOURCE_DIRECTORY / "tests"
|
||||
global_rc = 0
|
||||
|
||||
try:
|
||||
mypy_options = ['--cache-dir', str(mypy_config_file.parent / '.mypy_cache'),
|
||||
'--config-file', str(mypy_config_file),
|
||||
'--show-traceback',
|
||||
'--no-error-summary',
|
||||
'--hide-error-context'
|
||||
]
|
||||
mypy_options = [
|
||||
"--cache-dir",
|
||||
str(mypy_cache_dir),
|
||||
"--config-file",
|
||||
str(mypy_config_file),
|
||||
"--show-traceback",
|
||||
"--no-error-summary",
|
||||
"--hide-error-context",
|
||||
]
|
||||
mypy_options += [str(tests_root)]
|
||||
|
||||
import distutils.spawn
|
||||
|
||||
mypy_executable = distutils.spawn.find_executable('mypy')
|
||||
mypy_executable = spawn.find_executable("mypy")
|
||||
mypy_argv = [mypy_executable, *mypy_options]
|
||||
completed = subprocess.run(
|
||||
mypy_argv,
|
||||
env={'PYTHONPATH': str(tests_root)},
|
||||
env={"PYTHONPATH": str(tests_root), "TYPECHECK_TESTS": "1"},
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
)
|
||||
@@ -140,20 +96,19 @@ if __name__ == '__main__':
|
||||
sorted_lines = sorted(output.splitlines())
|
||||
for line in sorted_lines:
|
||||
try:
|
||||
path_to_error = line.split(':')[0]
|
||||
test_folder_name = path_to_error.split('/')[2]
|
||||
path_to_error = line.split(":")[0]
|
||||
test_folder_name = path_to_error.split("/")[2]
|
||||
except IndexError:
|
||||
test_folder_name = 'unknown'
|
||||
test_folder_name = "unknown"
|
||||
|
||||
if not is_ignored(line, test_folder_name,
|
||||
ignored_message_freqs=ignored_message_freqs):
|
||||
if not is_ignored(line, test_folder_name, ignored_message_freqs=ignored_message_freqs):
|
||||
global_rc = 1
|
||||
print(line)
|
||||
|
||||
unused_ignores = get_unused_ignores(ignored_message_freqs)
|
||||
if unused_ignores:
|
||||
print('UNUSED IGNORES ------------------------------------------------')
|
||||
print('\n'.join(unused_ignores))
|
||||
print("UNUSED IGNORES ------------------------------------------------")
|
||||
print("\n".join(unused_ignores))
|
||||
|
||||
sys.exit(global_rc)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user