modernize

Author: scivision

README.md

@@ -7,7 +7,8 @@
 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 [Google](https://developers.google.com/maps/documentation/geolocation/intro).
+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.
 
 ## Install
@@ -55,7 +56,7 @@ Would like to add Bluetooth, should be simple.
 * [Alternative using Skyhook and geoclue](https://github.com/scivision/python-geoclue)
 * [Raspberry Pi NetworkManager](https://raspberrypi.stackexchange.com/a/73816)
 
-### Raspberry Pi 3
+### Raspberry Pi 3 / Zero W
 Debian comes without NetworkManager by default.
 Be careful as you lose Wifi password etc. by this procedure
 

setup.cfg

@@ -36,11 +36,12 @@ install_requires =
 [options.extras_require]
 tests =
   pytest
+cov =
   pytest-cov
   coveralls
   flake8
   mypy
-kml = 
+io = 
   simplekml
 
 [options.entry_points]

tests/Test.kml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2">
+    <Document id="1">
+        <name>Tracks</name>
+        <Placemark id="3">
+            <name>test</name>
+            <gx:Track>
+                <when>2010-05-28T02:02:09Z</when>
+                <when>2010-05-28T02:02:35Z</when>
+                <when>2010-05-28T02:02:44Z</when>
+                <when>2010-05-28T02:02:53Z</when>
+                <when>2010-05-28T02:02:54Z</when>
+                <when>2010-05-28T02:02:55Z</when>
+                <when>2010-05-28T02:02:56Z</when>
+                <gx:coord>-122.207881 37.371915 156.0</gx:coord>
+                <gx:coord>-122.205712 37.373288 152.0</gx:coord>
+                <gx:coord>-122.204678 37.373939 147.0</gx:coord>
+                <gx:coord>-122.203572 37.37463 142.199997</gx:coord>
+                <gx:coord>-122.203451 37.374706 141.800003</gx:coord>
+                <gx:coord>-122.203329 37.37478 141.199997</gx:coord>
+                <gx:coord>-122.203207 37.374857 140.199997</gx:coord>
+            </gx:Track>
+        </Placemark>
+    </Document>
+</kml>

tests/test_all.py

@@ -20,4 +20,4 @@ def test_nm_connection():
 
 
 if __name__ == '__main__':
-    pytest.main()
+    pytest.main(['-xrsv', __file__])

tests/test_kml.py

@@ -1,12 +1,11 @@
 import pytest
-try:
-    from simplekml import Kml
-except ImportError:
-    Kml = None
+from pathlib import Path
+
+R = Path(__file__).parent
 
 
-@pytest.mark.skipif(Kml is None, reason="SimpleKML wasn't installed")
 def test_kml():
+    simplekml = pytest.importorskip('simplekml')
     # Data for the track
     when = ["2010-05-28T02:02:09Z",
             "2010-05-28T02:02:35Z",
@@ -24,14 +23,14 @@ def test_kml():
              (-122.203329, 37.374780, 141.199997),
              (-122.203207, 37.374857, 140.199997)]
 
-    kml = Kml(name="Tracks",)
+    kml = simplekml.Kml(name="Tracks",)
     trk = kml.newgxtrack(name='test')
 
     trk.newwhen(when)
     trk.newgxcoord(coord)
 
-    kml.save('Test.kml')
+    kml.save(R/'Test.kml')
 
 
 if __name__ == '__main__':
-    pytest.main()
+    pytest.main(['-xrsv', __file__])