Skip to content

Commit 5416ac2

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/output-format' into output-format
2 parents 3dc68fa + c0b151b commit 5416ac2

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

tests/test_activityhandler.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import os
22

33
import pytest
4-
from shapely.geometry import Point, Polygon
5-
64
from osmox import build, config, helpers
5+
from shapely.geometry import Point, Polygon
76

87
fixtures_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "fixtures"))
98
toy_osm_path = os.path.join(fixtures_root, "toy.osm")

tests/test_autotree.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import os
22

3-
from shapely.geometry import Point, Polygon
4-
53
from osmox import build, helpers
4+
from shapely.geometry import Point, Polygon
65

76
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "data"))
87
test_osm_path = os.path.join(root, "isle-of-man-latest.osm.pbf")

tests/test_config.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import os
22

33
import pytest
4-
54
from osmox import config
65

76
root = os.path.abspath(os.path.join(os.path.dirname(__file__), "fixtures"))

tests/test_helpers.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import pytest
2-
from shapely.geometry import Polygon
3-
42
from osmox import helpers
3+
from shapely.geometry import Polygon
54

65

76
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)