da-h · da-h · Dec 22, 2020 · Dec 22, 2020 · Dec 22, 2020 · Dec 7, 2020
diff --git a/.github/workflows/linting-python.yml b/.github/workflows/linting-python.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip wheel
-        python -m pip install flake8 pylint pytest
+        python -m pip install flake8 pylint
         # install deps for pylint
         python -m pip install colored
         # build and install the package itself

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -0,0 +1,32 @@
+name: Testing
+
+on: [push]
+
+jobs:
+  Pytest:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python 3.x
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip wheel
+        python -m pip install flake8 pylint pytest
+        # install deps for pylint
+        python -m pip install colored
+    - name: Syntax Check of Tests
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 tests --count --select=E9,F63,F7,F82 --show-source --statistics
+    - name: Static Analysis of Tests (Modules)
+      run: |
+        flake8 tests --count --ignore E501 --statistics
+        PYTHONPATH=$(pwd)/src find tests -type d -exec test -e '{}'/.module \; -exec pylint -d W0511 -d C0114 -d C0116 -d C0115 -d C0301 -d C0103 -d R0913 -d R0914 -d R0902 -d R0912 -d R0801 -d W0212 -d W0223 -d E1101 -d W0221 -d E1102 '{}' +
+        PYTHONPATH=$(pwd)/src find tests -type d -exec test -e '{}'/.module \; -exec pylint --exit-zero '{}' +
+    - name: Pytest
+      run: pytest
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+tests_deact
 .idea
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,12 +7,12 @@ repos:
     -   id: check-yaml
     -   id: check-added-large-files
     -   id: flake8
-        args: [--count,--ignore,E501,--statistics,--exclude,.git,__pycache__]
+        args: [--count,--ignore,E501,--statistics,--exclude,.git]
 -   repo: local
     hooks:
     -   id: pylint
         name: pylint
-        entry: pylint
+        entry: bash -c "PYTHONPATH=$(pwd)/src find tests -type d -exec test -e '{}'/.module \; -exec pylint -d W0511 -d C0114 -d C0116 -d C0115 -d C0301 -d C0103 -d R0913 -d R0914 -d R0902 -d R0912 -d R0801 -d W0212 -d W0223 -d E1101 -d W0221 -d E1102 '{}' +"
         language: system
         types: [python]
-        args: [ -d W0511 , -d C0114 , -d C0116 , -d C0115 , -d C0301 , -d C0103 , -d R0913 , -d R0914 , -d R0902 , -d R0912 , -d R0801 , -d W0212 , -d W0223 , -d E1101 , -d W0221 , -d E1102, -d E0611 ]
+        args: [  ]
diff --git a/src/miniflask/miniflask.py b/src/miniflask/miniflask.py
diff --git a/src/miniflask/modules/modules/__init__.py b/src/miniflask/modules/modules/__init__.py
@@ -1,6 +1,5 @@
 def showModules(state, event):
-    event._mf.showModules(with_event=state.all["events"])
-    print()
+    print(event._mf.showModules(with_event=state.all["events"]))
 
 
 def register(mf):

diff --git a/src/miniflask/modules/settings/__init__.py b/src/miniflask/modules/settings/__init__.py
@@ -43,10 +43,7 @@ def listsettings(state, asciicodes=True):
         if len(k) > 1:
             k_hidden = [" " * len(ki) if ki == ki2 and asciicodes else ki for ki, ki2 in zip_longest(k, last_k) if ki is not None]
             last_k = k
-            if k_hidden[-2] == "default":
-                k_hidden[-3] = color_name(k_hidden[-3])
-            else:
-                k_hidden[-2] = color_name(k_hidden[-2])
+            k_hidden[-2] = color_name(k_hidden[-2])
             k_hidden[-1] = color_module(k_hidden[-1])
         else:
             k_hidden = k

diff --git a/src/miniflask/util.py b/src/miniflask/util.py
@@ -12,7 +12,7 @@ def getModulesAvail(module_dirs, f=None):
         f = {}
     for base_module_name, directory in module_dirs.items():
         base_module_name = base_module_name.replace(".", "_")
-        # basename_dir = path.basename(directory)
+        directory = str(directory)  # in case directory is given as PosixPath etc.
         for (dirpath, dirnames, filenames) in walk(directory):
             local_import_name = dirpath[len(directory) + 1:].replace(path.sep, ".")
             module_name_id = base_module_name + "." + local_import_name

diff --git a/tests/enums/miniflask b/tests/enums/miniflask
@@ -0,0 +1 @@
+../../src/miniflask
diff --git a/tests/exception_event/miniflask b/tests/exception_event/miniflask
@@ -0,0 +1 @@
+../../src/miniflask
diff --git a/tests/exception_register/miniflask b/tests/exception_register/miniflask
@@ -0,0 +1 @@
+../../src/miniflask
diff --git a/tests/features/miniflask b/tests/features/miniflask
@@ -0,0 +1 @@
+../../src/miniflask
diff --git a/tests/outervar/miniflask b/tests/outervar/miniflask
@@ -0,0 +1 @@
+../../src/miniflask
diff --git a/tests/speedtest/modules/modulenomfargs/__init__.py b/tests/speedtest/modules/modulenomfargs/__init__.py
diff --git a/tests/speedtest/modules/modulenonunique/__init__.py b/tests/speedtest/modules/modulenonunique/__init__.py
diff --git a/tests/speedtest/modules/moduleunique/__init__.py b/tests/speedtest/modules/moduleunique/__init__.py
diff --git a/tests/speedtest/test_mf_class.py b/tests/speedtest/test_mf_class.py
diff --git a/tests/speedtest/test_mf_event.py b/tests/speedtest/test_mf_event.py
diff --git a/tests/speedtest/test_mf_event_nomfargs.py b/tests/speedtest/test_mf_event_nomfargs.py
diff --git a/tests/speedtest/test_mf_event_nonunique.py b/tests/speedtest/test_mf_event_nonunique.py
diff --git a/tests/speedtest/test_mf_python.py b/tests/speedtest/test_mf_python.py
diff --git a/tests/speedtest/test_mf_state.py b/tests/speedtest/test_mf_state.py
diff --git a/tests/speedtest/test_mf_state_fuzzy.py b/tests/speedtest/test_mf_state_fuzzy.py
diff --git a/tests/speedtest/test_python.py b/tests/speedtest/test_python.py
diff --git a/.../speedtest/modules/modulenomfargs/.module → tests/test_argparse/modules/module1/.module b/.../speedtest/modules/modulenomfargs/.module → tests/test_argparse/modules/module1/.module
diff --git a/tests/test_argparse/modules/module1/__init__.py b/tests/test_argparse/modules/module1/__init__.py
@@ -0,0 +1,50 @@
+from enum import Enum
+
+
+class SIZE(Enum):
+    SMALL = 0
+    MEDIUM = 1
+    LARGE = 2
+
+
+def print_all(state):
+    print("int1:", state["int1"])
+    print("int2:", state["int2"])
+    print("float1:", state["float1"])
+    print("float2:", state["float2"])
+    print("float3:", state["float3"])
+    print("float4:", state["float4"])
+    print("float5:", state["float5"])
+    print("float6:", state["float6"])
+    print("bool1:", state["bool1"])
+    print("bool2:", state["bool2"])
+    print("enum1:", state["enum1"])
+    print("str1:", state["str1"])
+    print("str2:", state["str2"])
+    print("str3:", state["str3"])
+
+
+def print_bool(state):
+    print("bool1:", state["bool1"])
+    print("bool2:", state["bool2"])
+
+
+def register(mf):
+    mf.register_defaults({
+        "int1": 42,
+        "int2": -42,
+        "float1": 2.345,
+        "float2": -2.345,
+        "float3": 0.0,
+        "float4": -0.0,
+        "float5": 1e7,
+        "float6": -1e7,
+        "bool1": True,
+        "bool2": False,
+        "enum1": SIZE.MEDIUM,
+        "str1": "",
+        "str2": "abcd1234",
+        "str3": "αβγδ∀⇐Γ∂",
+    })
+    mf.register_event('print_all', print_all)
+    mf.register_event('print_bool', print_bool)