Compare commits
2
Commits
master
..
fcf211872a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fcf211872a | ||
|
|
406fd3db4a |
@@ -110,10 +110,15 @@ end
|
||||
local function scan_test_function_pattern(runner, config, python_command)
|
||||
local test_function_pattern = "^test"
|
||||
if runner == "pytest" and config.pytest_discovery then
|
||||
<<<<<<< HEAD
|
||||
local cmd = vim
|
||||
.iter({ python_command, M.get_script_path(), "--pytest-extract-test-name-template" })
|
||||
:flatten()
|
||||
:totable()
|
||||
=======
|
||||
local cmd = vim.iter({ python_command, M.get_script_path(), "--pytest-extract-test-name-template" }):flatten()
|
||||
:totable()
|
||||
>>>>>>> 51c453d (feat: remove plenary)
|
||||
local _, data = lib.process.run(cmd, { stdout = true, stderr = true })
|
||||
|
||||
for line in vim.gsplit(data.stdout, "\n", true) do
|
||||
@@ -168,7 +173,7 @@ M.treesitter_queries = function(runner, config, python_command)
|
||||
end
|
||||
|
||||
M.get_root =
|
||||
lib.files.match_root_pattern("pyproject.toml", "setup.cfg", "mypy.ini", "pytest.ini", "setup.py")
|
||||
lib.files.match_root_pattern("pyproject.toml", "setup.cfg", "mypy.ini", "pytest.ini", "setup.py")
|
||||
|
||||
function M.create_dap_config(python_path, script_path, script_args, dap_args)
|
||||
return vim.tbl_extend("keep", {
|
||||
@@ -194,13 +199,13 @@ function M.get_runner(python_path)
|
||||
return "unittest"
|
||||
end
|
||||
if
|
||||
vim_test_runner and lib.func_util.index({ "unittest", "pytest", "django" }, vim_test_runner)
|
||||
vim_test_runner and lib.func_util.index({ "unittest", "pytest", "django" }, vim_test_runner)
|
||||
then
|
||||
return vim_test_runner
|
||||
end
|
||||
local runner = M.module_exists("pytest", python_path) and "pytest"
|
||||
or M.module_exists("django", python_path) and "django"
|
||||
or "unittest"
|
||||
or M.module_exists("django", python_path) and "django"
|
||||
or "unittest"
|
||||
stored_runners[command_str] = runner
|
||||
return runner
|
||||
end
|
||||
|
||||
@@ -24,7 +24,6 @@ SOCKET_ROOT_DIR = Path("/tmp/neotest-python")
|
||||
python_socket_path = (
|
||||
SOCKET_ROOT_DIR / hashlib.sha1(sys.executable.encode()).digest().hex()
|
||||
)
|
||||
python_socket_path.parent.mkdir(exist_ok=True,parents=True)
|
||||
|
||||
logger = logging.getLogger('neotest-python')
|
||||
logger.addHandler(WatchedFileHandler(filename=python_socket_path.with_suffix('.log')))
|
||||
|
||||
Reference in New Issue
Block a user