Merge pull request #570 from drothlis/drop-glob2

pyproject.toml

@@ -35,7 +35,6 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-glob2 = "*"
 Mako = "*"
 parse = "*"
 parse-type = "*"
@@ -83,5 +82,5 @@ warn_unused_configs = true
 files = "src/pytest_bdd/**/*.py"
 
 [[tool.mypy.overrides]]
-module = ["parse", "parse_type", "glob2"]
+module = ["parse", "parse_type"]
 ignore_missing_imports = true

src/pytest_bdd/feature.py

@@ -25,10 +25,9 @@
 """
 from __future__ import annotations
 
+import glob
 import os.path
 
-import glob2
-
 from .parser import Feature, parse_feature
 
 # Global features dictionary
@@ -70,7 +69,9 @@ def get_features(paths: list[str], **kwargs) -> list[Feature]:
         if path not in seen_names:
             seen_names.add(path)
             if os.path.isdir(path):
-                features.extend(get_features(glob2.iglob(os.path.join(path, "**", "*.feature")), **kwargs))
+                features.extend(
+                    get_features(glob.iglob(os.path.join(path, "**", "*.feature"), recursive=True), **kwargs)
+                )
             else:
                 base, name = os.path.split(path)
                 feature = get_feature(base, name, **kwargs)

src/pytest_bdd/scripts.py

@@ -2,11 +2,10 @@
 from __future__ import annotations
 
 import argparse
+import glob
 import os.path
 import re
 
-import glob2
-
 from .generation import generate_code, parse_feature_files
 
 MIGRATE_REGEX = re.compile(r"\s?(\w+)\s=\sscenario\((.+)\)", flags=re.MULTILINE)
@@ -15,7 +14,7 @@
 def migrate_tests(args: argparse.Namespace) -> None:
     """Migrate outdated tests to the most recent form."""
     path = args.path
-    for file_path in glob2.iglob(os.path.join(os.path.abspath(path), "**", "*.py")):
+    for file_path in glob.iglob(os.path.join(os.path.abspath(path), "**", "*.py"), recursive=True):
         migrate_tests_in_file(file_path)