Skip to content

Commit 642c8a2

Browse files
authored
Merge pull request #49 from uci-uav-forge/48-relative-not-absolute-imports
#48 Remove relative imports. Resolve #48
2 parents b8428f3 + fe636a4 commit 642c8a2

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

src/uavfpy/odcl/color.py

-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import numpy as np
22
import cv2
3-
import logging
43
from sklearn import neighbors
54
from pathlib import Path
6-
import os
75

86
COLOR_NAMES = {
97
0: "white",

src/uavfpy/odcl/location.py

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
1616
"""
1717
import numpy as np
18-
import cv2
19-
2018

2119
EARTH_RADIUS = 6378137 # meters of radius of earth
2220

src/uavfpy/odcl/pipeline.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
from .inference import TargetInterpreter, Target, Tiler
2-
from .utils.drawer import TargetDrawer
3-
from .color import Color
41
import logging
52
import cv2, time
63
import numpy as np
74
from uuid import uuid4
85

6+
# relative imports
7+
from .inference import TargetInterpreter, Target, Tiler
8+
from .utils.drawer import TargetDrawer
9+
from .color import Color
10+
911

1012
class FoundTarget(object):
1113
def __init__(self, **kwargs):

src/uavfpy/planner/mission.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
import json, pyproj
2-
import surface
1+
import json, pyproj, time, cv2, rrtplanner, logging, sys
32
import numpy as np
43
from typing import Tuple
54
from shapely.geometry import Polygon, Point
6-
from scipy import ndimage
7-
import rrtplanner
8-
import logging, sys
95
from tqdm import tqdm
106
import matplotlib.pyplot as plt
11-
import time
12-
import cv2
137
from math import ceil
148

9+
# relative imports
10+
from . import surface
11+
1512

1613
logging.basicConfig(stream=sys.stdout, level=logging.INFO)
1714

src/uavfpy/planner/surface.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import numpy as np
22
import cvxpy as cp
3-
import matplotlib.pyplot as plt
43
from typing import Tuple
54
import logging
65

0 commit comments

Comments
 (0)