add windows test

Author: scivision

.flake8

@@ -3,3 +3,4 @@ max-line-length = 132
 exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/
 per-file-ignores =
     __init__.py:F401
+    modules.py:F401

mozloc/__init__.py

@@ -1 +1,2 @@
 from .base import log_wifi_loc
+from .modules import get_cli, cli_config_check

mozloc/base.py

@@ -1,13 +1,8 @@
 from time import sleep
 from pathlib import Path
-import sys
-
-if sys.platform == "win32":
-    from .netsh import cli_config_check, get_cli
-elif sys.platform == "linux":
-    from .netman import cli_config_check, get_cli
-else:
-    raise ImportError(f"MozLoc doesn't yet know how to work with platform {sys.platform}")
+
+from .modules import get_cli, cli_config_check
+
 HEADER = "time lat lon accuracy NumBSSIDs"
 
 

mozloc/modules.py

@@ -0,0 +1,8 @@
+import sys
+
+if sys.platform == "win32":
+    from .netsh import cli_config_check, get_cli
+elif sys.platform == "linux":
+    from .netman import cli_config_check, get_cli
+else:
+    raise ImportError(f"MozLoc doesn't yet know how to work with platform {sys.platform}")

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mozilla-location-python
-version = 0.9.0
+version = 1.0.0
 author = Michael Hirsch, Ph.D.
 author_email = [email protected]
 url = https://github.com/scivision/mozilla-location-wifi
@@ -14,6 +14,7 @@ classifiers =
   Intended Audience :: Information Technology
   Intended Audience :: System Administrators
   Operating System :: POSIX :: Linux
+  Operating System :: Microsoft :: Windows
   Programming Language :: Python :: 3.6
   Programming Language :: Python :: 3.7
   Programming Language :: Python :: 3.8

tests/test_all.py renamed to tests/test_netman.py

@@ -8,10 +8,13 @@ def test_nm_loc():
     mozloc = pytest.importorskip("mozloc")
 
     try:
-        loc = mozloc.netman.get_cli()
+        loc = mozloc.get_cli()
     except subprocess.CalledProcessError as e:
         pytest.skip(f"problem with NMCLI API--old NMCLI version?  {e}")
 
+    if loc is None:
+        pytest.skip("need at least 2 WiFi AP")
+
     assert isinstance(loc, dict)
     assert isinstance(loc["t"], datetime.datetime)
 
@@ -20,9 +23,9 @@ def test_nm_connection():
     mozloc = pytest.importorskip("mozloc")
 
     try:
-        mozloc.netman.cli_config_check()
+        mozloc.cli_config_check()
     except subprocess.CalledProcessError as e:
-        pytest.skip(f"problem with NMCLI WiFi API--do you have WiFi?  {e}")
+        pytest.skip(f"problem with CLI WiFi API--do you have WiFi?  {e}")
 
 
 if __name__ == "__main__":