punit 1.2.14__tar.gz → 1.2.19__tar.gz

{punit-1.2.14/src/pUnit.egg-info → punit-1.2.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pUnit
-Version: 1.2.14
+Version: 1.2.19
 Summary: A modernized unit-test framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License: MIT License
@@ -39,7 +39,6 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
-Requires-Dist: furo; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -94,9 +93,9 @@ Usage: python3 -m punit [-h|--help]
                         [-p|--test-package NAME]
                         [-i|--include PATTERN]
                         [-e|--exclude PATTERN]
-                        [-f|--filter PATTERN]
+                        [-f|--filter PATTERN|@FILEPATH]
                         [-t|--trait [!]NAME[=VALUE]]
-                        [-w|--workdir DIRECTORY]
+                        [-w|--working-directory PATH]
                         [-n|--no-default-patterns]
                         [-r|--report {junit|json}]
                         [-o|--output FILENAME]
@@ -116,15 +115,17 @@ Options:
     -e, --exclude PATTERN
         Exclude any tests matching PATTERN, overriding --include
         Default: '__*__' (dunder files), '/.*/' (dot-directories)
-    -f, --filter PATTERN
+    -f, --filter PATTERN|@FILEPATH
         Only execute tests matching PATTERN
         Default: '*'
+        To specify a file containing a list of filters, prefix
+        with '@' and provide the path to the file.
     -t, --trait [!]NAME[=VALUE]
         Execute tests with the specified trait, negated by prefixing with '!'.
         If VALUE is specified, matches tests with the trait having specified value.
         If VALUE is not specified, matches any test with the trait having any value.
         Default: No filtering based on traits.        
-    -w, --working-directory DIRECTORY
+    -w, --working-directory PATH
         Working directory (defaults to start directory)
     -n, --no-default-patterns
         Do not apply any default include/exclude patterns.

{punit-1.2.14 → punit-1.2.19}/README.md

@@ -47,9 +47,9 @@ Usage: python3 -m punit [-h|--help]
                         [-p|--test-package NAME]
                         [-i|--include PATTERN]
                         [-e|--exclude PATTERN]
-                        [-f|--filter PATTERN]
+                        [-f|--filter PATTERN|@FILEPATH]
                         [-t|--trait [!]NAME[=VALUE]]
-                        [-w|--workdir DIRECTORY]
+                        [-w|--working-directory PATH]
                         [-n|--no-default-patterns]
                         [-r|--report {junit|json}]
                         [-o|--output FILENAME]
@@ -69,15 +69,17 @@ Options:
     -e, --exclude PATTERN
         Exclude any tests matching PATTERN, overriding --include
         Default: '__*__' (dunder files), '/.*/' (dot-directories)
-    -f, --filter PATTERN
+    -f, --filter PATTERN|@FILEPATH
         Only execute tests matching PATTERN
         Default: '*'
+        To specify a file containing a list of filters, prefix
+        with '@' and provide the path to the file.
     -t, --trait [!]NAME[=VALUE]
         Execute tests with the specified trait, negated by prefixing with '!'.
         If VALUE is specified, matches tests with the trait having specified value.
         If VALUE is not specified, matches any test with the trait having any value.
         Default: No filtering based on traits.        
-    -w, --working-directory DIRECTORY
+    -w, --working-directory PATH
         Working directory (defaults to start directory)
     -n, --no-default-patterns
         Do not apply any default include/exclude patterns.

{punit-1.2.14 → punit-1.2.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pUnit"
-version = "1.2.14"
+version = "1.2.19"
 description = "A modernized unit-test framework for Python."
 keywords = ["test", "unittest", "unit-test", "xUnit", "nUnit", "pytest"]
 authors = [
@@ -22,7 +22,6 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    "furo",
     "coverage",
     "mypy",
     "twine"

{punit-1.2.14 → punit-1.2.19/src/pUnit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pUnit
-Version: 1.2.14
+Version: 1.2.19
 Summary: A modernized unit-test framework for Python.
 Author-email: Shaun Wilson <mrshaunwilson@msn.com>
 License: MIT License
@@ -39,7 +39,6 @@ Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
-Requires-Dist: furo; extra == "dev"
 Requires-Dist: coverage; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: twine; extra == "dev"
@@ -94,9 +93,9 @@ Usage: python3 -m punit [-h|--help]
                         [-p|--test-package NAME]
                         [-i|--include PATTERN]
                         [-e|--exclude PATTERN]
-                        [-f|--filter PATTERN]
+                        [-f|--filter PATTERN|@FILEPATH]
                         [-t|--trait [!]NAME[=VALUE]]
-                        [-w|--workdir DIRECTORY]
+                        [-w|--working-directory PATH]
                         [-n|--no-default-patterns]
                         [-r|--report {junit|json}]
                         [-o|--output FILENAME]
@@ -116,15 +115,17 @@ Options:
     -e, --exclude PATTERN
         Exclude any tests matching PATTERN, overriding --include
         Default: '__*__' (dunder files), '/.*/' (dot-directories)
-    -f, --filter PATTERN
+    -f, --filter PATTERN|@FILEPATH
         Only execute tests matching PATTERN
         Default: '*'
+        To specify a file containing a list of filters, prefix
+        with '@' and provide the path to the file.
     -t, --trait [!]NAME[=VALUE]
         Execute tests with the specified trait, negated by prefixing with '!'.
         If VALUE is specified, matches tests with the trait having specified value.
         If VALUE is not specified, matches any test with the trait having any value.
         Default: No filtering based on traits.        
-    -w, --working-directory DIRECTORY
+    -w, --working-directory PATH
         Working directory (defaults to start directory)
     -n, --no-default-patterns
         Do not apply any default include/exclude patterns.

{punit-1.2.14 → punit-1.2.19}/src/pUnit.egg-info/requires.txt

@@ -1,6 +1,5 @@
 
 [dev]
-furo
 coverage
 mypy
 twine

{punit-1.2.14 → punit-1.2.19}/src/punit/__init__.py

@@ -7,8 +7,8 @@ from .theories import *
 from .traits import *
 
 
-__version__ = '1.2.14'
-__commit__ = 'c9cba7c'
+__version__ = '1.2.19'
+__commit__ = 'af80eb6'
 __all__ = [
     '__version__', '__commit__',
     'assertions',

{punit-1.2.14 → punit-1.2.19}/src/punit/cli.py

@@ -208,9 +208,9 @@ Usage: python3 -m punit [-h|--help]
                         [-p|--test-package NAME]
                         [-i|--include PATTERN]
                         [-e|--exclude PATTERN]
-                        [-f|--filter PATTERN]
+                        [-f|--filter PATTERN|@FILEPATH]
                         [-t|--trait [!]NAME[=VALUE]]
-                        [-w|--workdir DIRECTORY]
+                        [-w|--working-directory PATH]
                         [-n|--no-default-patterns]
                         [-r|--report {junit|json}]
                         [-o|--output FILENAME]
@@ -230,15 +230,17 @@ Options:
     -e, --exclude PATTERN
         Exclude any tests matching PATTERN, overriding --include
         Default: '__*__' (dunder files), '/.*/' (dot-directories)
-    -f, --filter
+    -f, --filter PATTERN|@FILEPATH
         Only execute tests matching PATTERN
         Default: '*'
+        To specify a file containing a list of filters, prefix
+        with '@' and provide the path to the file.
     -t, --trait [!]NAME[=VALUE]
         Execute tests with the specified trait, negated by prefixing with '!'.
         If VALUE is specified, matches tests with the trait having specified value.
         If VALUE is not specified, matches any test with the trait having any value.
         Default: No filtering based on traits.        
-    -w, --working-directory DIRECTORY
+    -w, --working-directory PATH
         Working directory (defaults to start directory)
     -n, --no-default-patterns
         Do not apply any default include/exclude patterns.
@@ -267,8 +269,15 @@ Options:
             print('Exclude Patterns:')
             for pattern in self.__excludePatterns:
                 print(f'\t{pattern}')
-        print('Filter Pattern:')
-        print(f'\t{self.__filterPattern}')
+        if self.__filterPattern.startswith('@'):
+            print(f'Filter Patterns: (from {self.__filterPattern[1:]})')
+            if not os.path.exists(os.path.realpath(self.__filterPattern[1:])):
+                print(f'\tFILTERS FILE DOES NOT EXIST, ABORTING!')
+                exit(5)
+        else:
+            print('Filter Pattern:')
+            print(f'\t{self.__filterPattern}')
+
     def printVersion(self) -> None:
         print(f'pUnit {__version__} ({__commit__})')
 
@@ -283,7 +292,7 @@ Options:
         if not self.__no_default_patterns:
             # if no other patterns specified, default to including all files found in the directory matching `testPackageName`
             if len(self.__includePatterns) == 0:
-                self.__includePatterns.append(f'/{self.testPackageName}/*.py')
+                self.__includePatterns.append(f'*.py')
             # always exclude dot-folders (.git, .venv, etc)
             self.__excludePatterns.append('/.*')
             # always exclude dunder files

{punit-1.2.14 → punit-1.2.19}/src/punit/discovery/TestModuleDiscovery.py

@@ -15,12 +15,12 @@ class TestModuleDiscovery:
     __excludePatterns:list[re.Pattern]
     __excludeTraits:list[Trait]
     __filenames:list[str]
-    __filterPattern:re.Pattern
+    __filterPatterns:list[re.Pattern]
     __includePatterns:list[re.Pattern]
     __includeTraits:list[Trait]
     __workdir:str
 
-    def __init__(self, workdir:str, includePatterns:list[str], excludePatterns:list[str], cli:CommandLineInterface):
+    def __init__(self, workdir:str, includePatterns:list[str], excludePatterns:list[str], cli:CommandLineInterface) -> None:
         self.__cli = cli
         self.__excludePatterns = []
         if excludePatterns is not None:
@@ -30,7 +30,7 @@ class TestModuleDiscovery:
                         self.__convertPatternToRegex(pattern),
                         re.IGNORECASE))
         self.__filenames = []
-        self.__filterPattern = re.compile(self.__convertPatternToRegex(cli.filterPattern))        
+        self.__filterPatterns = self.__buildFilterPatterns(cli.filterPattern)
         self.__includePatterns = []
         self.__excludeTraits = cli.excludeTraits
         self.__includeTraits = cli.includeTraits
@@ -42,7 +42,22 @@ class TestModuleDiscovery:
                         re.IGNORECASE))
         self.__workdir = workdir
 
-    def __convertPatternToRegex(self, pattern:str):
+    def __buildFilterPatterns(self, input:str) -> list[re.Pattern]:
+        if input.startswith('@'):
+            # treat as a filepath containing one or more filter patterns
+            filepath = os.path.realpath(input[1:])
+            with open(filepath, 'rb') as f:
+                result = list[re.Pattern]()                
+                for line in f.read().decode().splitlines():
+                    if (self.__cli.verbose):
+                        print(f'\t{line}')
+                    result.append(re.compile(self.__convertPatternToRegex(line)))
+                return result
+        else:
+            # treat as a single filter pattern
+            return [re.compile(self.__convertPatternToRegex(input))]
+
+    def __convertPatternToRegex(self, pattern:str) -> str:
         result = re.escape(pattern)\
             .replace('\\\\', '/')\
             .replace('\\*', r'.+')\
@@ -100,10 +115,10 @@ class TestModuleDiscovery:
         
     def discover(self) -> list[str]:
         FactManager.instance().excludeTraits = self.__excludeTraits
-        FactManager.instance().filterPattern = self.__filterPattern
+        FactManager.instance().filterPatterns = self.__filterPatterns
         FactManager.instance().includeTraits = self.__includeTraits
         TheoryManager.instance().excludeTraits = self.__excludeTraits
-        TheoryManager.instance().filterPattern = self.__filterPattern
+        TheoryManager.instance().filterPatterns = self.__filterPatterns
         TheoryManager.instance().includeTraits = self.__includeTraits
         if self.__cli.verbose:
             print(f'.. starting test discovery')

{punit-1.2.14 → punit-1.2.19}/src/punit/facts/FactManager.py

@@ -12,7 +12,7 @@ from ..traits.Trait import Trait
 class FactManager:
 
     __excludeTraits:list[Trait]    
-    __filterPattern:Optional[re.Pattern]
+    __filterPatterns:Optional[list[re.Pattern]]
     __instance:Optional['FactManager'] = None
     __includeTraits:list[Trait]
     __modules:dict[str, list[Fact]]
@@ -21,7 +21,7 @@ class FactManager:
     def __init__(self):
         if FactManager.__instance is not None:
             raise Exception('Cannot create more than one instance of FactManager') # pragma: no cover
-        self.__filterPattern = None
+        self.__filterPatterns = None
         self.__modules = {}
         self.__traits = {}
 
@@ -40,12 +40,12 @@ class FactManager:
         self.__excludeTraits = value
 
     @property
-    def filterPattern(self) -> Optional[re.Pattern]:
-        return self.__filterPattern
+    def filterPatterns(self) -> Optional[list[re.Pattern]]:
+        return self.__filterPatterns
     
-    @filterPattern.setter
-    def filterPattern(self, value:re.Pattern) -> None:
-        self.__filterPattern = value
+    @filterPatterns.setter
+    def filterPatterns(self, value:list[re.Pattern]) -> None:
+        self.__filterPatterns = value
 
     @property
     def includeTraits(self) -> list[Trait]:
@@ -77,7 +77,13 @@ class FactManager:
         return l
 
     def put(self, fact:Fact) -> None:
-        if self.filterPattern is None or len(self.filterPattern.findall(fact.filterName)) > 0:
+        matchesFilterPattern:bool = self.filterPatterns is None
+        if self.filterPatterns is not None and len(self.filterPatterns) > 0:
+            for filterPattern in self.filterPatterns:
+                if len(filterPattern.findall(fact.filterName)) > 0:
+                    matchesFilterPattern = True
+                    break
+        if matchesFilterPattern:
             l = self.get(fact.moduleName)
             t = self.__traits.get(fact.target)
             if t is not None:

{punit-1.2.14 → punit-1.2.19}/src/punit/theories/TheoryManager.py

@@ -12,7 +12,7 @@ from .Theory import Theory
 class TheoryManager:
 
     __excludeTraits:list[Trait]
-    __filterPattern:Optional[re.Pattern]
+    __filterPatterns:Optional[list[re.Pattern]]
     __includeTraits:list[Trait]
     __instance:Optional['TheoryManager'] = None
     __modules:dict[str, list[Theory]]
@@ -22,7 +22,7 @@ class TheoryManager:
     def __init__(self):
         if TheoryManager.__instance is not None:
             raise Exception('Cannot create more than one instance of TheoryManager') # pragma: no cover
-        self.__filterPattern = None
+        self.__filterPatterns = None
         self.__modules = {}
         self.__datas = {}
         self.__traits = {}
@@ -42,12 +42,12 @@ class TheoryManager:
         self.__excludeTraits = value
 
     @property
-    def filterPattern(self) -> Optional[re.Pattern]:
-        return self.__filterPattern
+    def filterPatterns(self) -> Optional[list[re.Pattern]]:
+        return self.__filterPatterns
     
-    @filterPattern.setter
-    def filterPattern(self, value:re.Pattern) -> None:
-        self.__filterPattern = value
+    @filterPatterns.setter
+    def filterPatterns(self, value:list[re.Pattern]) -> None:
+        self.__filterPatterns = value
 
     @property
     def includeTraits(self) -> list[Trait]:
@@ -79,7 +79,13 @@ class TheoryManager:
         return l
 
     def put(self, theory:Theory) -> None:
-        if self.filterPattern is None or len(self.filterPattern.findall(theory.filterName)) > 0:
+        matchesFilterPattern:bool = self.filterPatterns is None
+        if self.filterPatterns is not None and len(self.filterPatterns) > 0:
+            for filterPattern in self.filterPatterns:
+                if len(filterPattern.findall(theory.filterName)) > 0:
+                    matchesFilterPattern = True
+                    break
+        if matchesFilterPattern:
             l = self.get(theory.moduleName)
             d = self.__datas.get(theory.target)
             if d is not None: