Skip to content

Commit b29fcfc

Browse files
authored
Merge pull request #163 from i4Ds/FS_rename-resource-unittest-fail
rename resource because of conflict in unittest lib
2 parents 885e19a + c532c6c commit b29fcfc

7 files changed

Lines changed: 16 additions & 5 deletions

File tree

.vscode/settings.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"python.testing.unittestArgs": [
3+
"-v",
4+
"-s",
5+
"./karabo",
6+
"-p",
7+
"test_*.py"
8+
],
9+
"python.testing.pytestEnabled": false,
10+
"python.testing.unittestEnabled": true
11+
}

karabo/imaging/image.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from astropy.wcs import WCS
1313
from matplotlib import pyplot as plt
1414

15-
from karabo.resource import KaraboResource
15+
from karabo.karabo_resource import KaraboResource
1616
from karabo.util.FileHandle import FileHandle
1717

1818
# store and restore the previously set matplotlib backend, because rascil sets it to Agg (non-GUI)

karabo/simulation/observation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import datetime
22
from datetime import timedelta, datetime
33

4-
from karabo.resource import KaraboResource
4+
from karabo.karabo_resource import KaraboResource
55

66

77
class Observation(KaraboResource):

karabo/simulation/telescope.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import oskar.telescope as os_telescope
99

1010
import karabo.error
11-
from karabo.resource import KaraboResource
11+
from karabo.karabo_resource import KaraboResource
1212
from karabo.simulation.coordinate_helper import east_north_to_long_lat
1313
from karabo.simulation.east_north_coordinate import EastNorthCoordinate
1414
from karabo.simulation.station import Station

karabo/simulation/visibility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os.path
22
import shutil
33

4-
from karabo.resource import KaraboResource
4+
from karabo.karabo_resource import KaraboResource
55
from karabo.util.FileHandle import FileHandle
66

77

karabo/sourcedetection/result.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from bdsf import image as bdsf_image
77

88
from karabo.imaging.image import Image
9-
from karabo.resource import KaraboResource
9+
from karabo.karabo_resource import KaraboResource
1010
from karabo.util.FileHandle import FileHandle
1111
from karabo.util.data_util import read_CSV_to_ndarray
1212

0 commit comments

Comments
 (0)