meta

test skip non-linux

importerror when nmcli not found

Author: scivision

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 132
+exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/

.travis.yml

@@ -11,16 +11,18 @@ python:
 
 matrix:
   include:
+   - os: linux
+    name: Integration install
+    python: 3.7
+    install:
+    - python setup.py install
+    - pip install mozloc[tests,full]
+    script:
+    - cd $HOME
+    - python -m pytest $TRAVIS_BUILD_DIR/tests -r a -v
   - os: linux
     python: 3.7
     install: pip install -e .[tests,cov]
     script:
     - flake8
-    - mypy . --ignore-missing-imports
-    after_success:
-    - pytest --cov
-    - coveralls
-
-install: pip install -e .[tests]
-
-script: pytest -rsv
+    - mypy .

LICENSE renamed to LICENSE.txt

@@ -1,13 +1,13 @@
+[![Build Status](https://travis-ci.com/scivision/mozilla-location-wifi-python.svg?branch=master)](https://travis-ci.com/scivision/mozilla-location-wifi-python)
 [![Python versions (PyPI)](https://img.shields.io/pypi/pyversions/mozilla-location-python.svg)](https://pypi.python.org/pypi/mozilla-location-python)
-[![Distribution format (PyPI)](https://img.shields.io/pypi/format/mozilla-location-python.svg)](https://pypi.python.org/pypi/mozilla-location-python)
 [![PyPi Download stats](http://pepy.tech/badge/mozilla-location-python)](http://pepy.tech/project/mozilla-location-python)
 
 
 # mozilla-location-python
 Uses nmcli on Linux in a short, simple Mozilla Location Services with Wifi from Python.
 Goal was to be as simple as possible.
 
-Note that a similar service with better accuracy is available from 
+Note that a similar service with better accuracy is available from
 [Google](https://developers.google.com/maps/documentation/geolocation/intro).
 Let us know if you're interested.
 
@@ -38,7 +38,7 @@ You can display your logged data in Google Earth or other KML value after conver
 with
 
     pip install simplekml
-    
+
 Note that your time MUST be in ISO 8601 format or some KML reading programs such as Google Earth will just show a blank file.
 E.g.
 

README.md

@@ -3,15 +3,20 @@
 from io import StringIO
 import pandas
 import requests
+import shutil
 from datetime import datetime
 from time import sleep
 from pathlib import Path
 from typing import Dict, Any, Optional
-#
+
+NMCLI = shutil.which('nmcli')
+if not NMCLI:
+    raise ImportError('This program relies on NetworkManager via "nmcli"')
+
 URL = 'https://location.services.mozilla.com/v1/geolocate?key=test'
-NMCMD = ['nmcli', '-g', 'SSID,BSSID,FREQ,SIGNAL', 'device', 'wifi']  # Debian stretch, Ubuntu 18.04
-NMLEG = ['nmcli', '-t', '-f', 'SSID,BSSID,FREQ,SIGNAL', 'device', 'wifi']  # ubuntu 16.04
-NMSCAN = ['nmcli', 'device', 'wifi', 'rescan']
+NMCMD = [NMCLI, '-g', 'SSID,BSSID,FREQ,SIGNAL', 'device', 'wifi']  # Debian stretch, Ubuntu 18.04
+NMLEG = [NMCLI, '-t', '-f', 'SSID,BSSID,FREQ,SIGNAL', 'device', 'wifi']  # ubuntu 16.04
+NMSCAN = [NMCLI, 'device', 'wifi', 'rescan']
 HEADER = 'time lat lon accuracy NumBSSIDs'
 
 # %%
@@ -47,14 +52,10 @@ def logwifiloc(T: float, logfile: Path):
 
 def nm_config_check():
     # %% check that NetworkManager CLI is available and WiFi is active
-    try:
-        ret = subprocess.check_output(['nmcli', '-t', 'radio', 'wifi'], universal_newlines=True, timeout=1.).strip().split(':')
-    except FileNotFoundError:
-        raise OSError('CUrrently this program relies on NetworkManager')
+    ret = subprocess.check_output([NMCLI, '-t', 'radio', 'wifi'], universal_newlines=True, timeout=1.).strip().split(':')
 
-    assert 'enabled' in ret and 'disabled' not in ret, 'must enable WiFi, perhaps via nmcli radio wifi on'
-
-# %%
+    if 'enabled' not in ret and 'disabled' in ret:
+        raise OSError('must enable WiFi, perhaps via nmcli radio wifi on')
 
 
 def get_nmcli() -> Optional[Dict[str, Any]]:

mozloc/__init__.py

@@ -0,0 +1,6 @@
+[mypy]
+ignore_missing_imports = True
+strict_optional = False
+allow_redefinition = True
+show_error_context = False
+show_column_numbers = True

mypy.ini

@@ -2,6 +2,7 @@
 name = mozilla-location-python
 version = 0.5.1
 author = Michael Hirsch, Ph.D.
+author_email = scivision@users.noreply.github.com
 url = https://github.com/scivision/mozilla-location-wifi-python
 description = Using Mozilla Location services, log location vs. time using WiFi or convert to KML.
 keywords =
@@ -12,12 +13,14 @@ classifiers =
   Environment :: Console
   Intended Audience :: Information Technology
   Intended Audience :: System Administrators
-  Operating System :: OS Independent
+  Operating System :: POSIX :: Linux
   Programming Language :: Python :: 3.6
   Programming Language :: Python :: 3.7
+  Programming Language :: Python :: 3.8
   Topic :: System :: Networking
   Topic :: Utilities
-license_file = LICENSE
+license_files =
+  LICENSE.txt
 long_description = file: README.md
 long_description_content_type = text/markdown
 
@@ -26,9 +29,10 @@ python_requires = >= 3.6
 setup_requires =
   setuptools >= 38.6
   pip >= 10
-  twine >= 1.11
-include_package_data = True
 packages = find:
+scripts =
+  csv2kml.py
+  MozLoc.py
 install_requires =
   pandas
   requests
@@ -48,8 +52,3 @@ io =
 console_scripts =
   MozLoc = MozLoc:main
   csv2kml = csv2kml:main
-
-
-[flake8]
-max-line-length = 132
-exclude = .git,__pycache__,.eggs/,doc/,docs/,build/,dist/,archive/

setup.cfg

@@ -1,20 +1,24 @@
 #!/usr/bin/env python
 import pytest
-import mozloc
 import datetime
 import subprocess
 
 
 def test_nm_loc():
+    mozloc = pytest.importorskip('mozloc')
+
     try:
         loc = mozloc.get_nmcli()
     except subprocess.CalledProcessError as e:
         pytest.xfail(f'problem with NMCLI API--old NMCLI version?  {e}')
+
     assert isinstance(loc, dict)
     assert isinstance(loc['t'], datetime.datetime)
 
 
 def test_nm_connection():
+    mozloc = pytest.importorskip('mozloc')
+
     try:
         mozloc.nm_config_check()
     except subprocess.CalledProcessError as e: