Merge pull request #141 from KaartGroup/pytest

Leveraging pytest features

Author: mvexel

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v1

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - 3.6
   - 3.7
   - 3.8
   - 3.9

Pipfile

@@ -5,8 +5,8 @@ name = "pypi"
 
 [packages]
 geojson = ">=1.3.1"
+pytest = "6.0.0"
 requests = ">=2.20.0"
-nose = ">=1.3.7"
 shapely = ">=1.6.4"
 
 [dev-packages]

conftest.py

@@ -273,7 +273,7 @@ def _as_geojson(self, elements):
             except KeyError:
                 raise UnknownOverpassError("Received corrupt data from Overpass (no id).")
             elem_type = elem.get("type")
-            elem_tags = elem.get("tags")
+            elem_tags = elem.get("tags", {})
             elem_nodes = elem.get("nodes", None)
             elem_timestamp = elem.get("timestamp", None)
             elem_user = elem.get("user", None)

overpass/api.py

@@ -1,2 +1,3 @@
 pytest>=6.2.0
+requests-mock[fixture]
 tox>=3.20.1

requirements-dev.txt

@@ -1,4 +1,4 @@
 geojson>=1.3.1
+pytest
 requests>=2.8.1
-nose>=1.3.7
 shapely>=1.6.4

requirements.txt

@@ -13,7 +13,6 @@
     keywords=["openstreetmap", "overpass", "wrapper"],
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",