Skip to content

Commit 793b8aa

Browse files
committed
broke pooch
1 parent 1f47063 commit 793b8aa

4 files changed

Lines changed: 45 additions & 40 deletions

File tree

examples/example.ipynb

Lines changed: 22 additions & 29 deletions
Large diffs are not rendered by default.

mapmanagercore/data/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,25 @@
66
The first fetch will download the file and will take a few seconds.
77
88
The next fetch will reload from the local file (no download)?
9+
10+
As a github workflow:
11+
/home/runner/.cache/pooch
912
"""
1013

1114
import pooch
1215

1316
def getPointsFile() -> str:
1417
"""Download and get path to points csv.
1518
"""
16-
urlPoints = 'https://raw.githubusercontent.com/mapmanager/MapManagerCore-Data/main/data/rr30a_s0u/points.csv'
17-
# urlPoints = 'https://github.com/mapmanager/MapManagerCore-Data/raw/main/data/rr30a_s0u/points.csv'
19+
urlPoints = 'https://github.com/mapmanager/MapManagerCore-Data/raw/main/data/rr30a_s0u/points.csv'
1820
pointsPath = pooch.retrieve(
1921
url=urlPoints,
2022
known_hash=None
2123
)
2224
return pointsPath
2325

2426
def getLinesFile() -> str:
25-
urlLines = 'https://raw.githubusercontent.com/mapmanager/MapManagerCore-Data/main/data/rr30a_s0u/line_segments.csv'
26-
# urlLines = 'https://github.com/mapmanager/MapManagerCore-Data/raw/main/data/rr30a_s0u/line_segments.csv'
27+
urlLines = 'https://github.com/mapmanager/MapManagerCore-Data/raw/main/data/rr30a_s0u/line_segments.csv'
2728
linePath = pooch.retrieve(
2829
url=urlLines,
2930
known_hash=None

tests/test_data_loader.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1+
import pandas as pd
12
import pytest
23
import mapmanagercore.data
34

45
def test_load():
56
linesFile = mapmanagercore.data.getLinesFile()
7+
8+
dfLines = pd.read_csv(linesFile)
9+
print('=== test_load')
10+
print(dfLines)
11+
612
pointsFile = mapmanagercore.data.getPointsFile()
13+
714
ch1 = mapmanagercore.data.getTiffChannel_1()
15+
816
ch2 = mapmanagercore.data.getTiffChannel_2()
17+
918
mmap = mapmanagercore.data.getSingleTimepointMap()
1019

20+
1121
if __name__ == '__main__':
1222
test_load()
13-
23+
1424

tests/test_gen_example_notebook.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ def test_notebook(self):
2727
lineSegments=getLinesFile()
2828
print('lineSegments:', lineSegments)
2929
map = MapAnnotations(loader.build(),
30-
# lineSegments="../data/rr30a_s0u/line_segments.csv",
31-
# points="../data/rr30a_s0u/points.csv")
32-
lineSegments=getLinesFile(),
33-
points=getPointsFile())
30+
# lineSegments="../data/rr30a_s0u/line_segments.csv",
31+
# points="../data/rr30a_s0u/points.csv",
32+
lineSegments=getLinesFile(),
33+
points=getPointsFile()
34+
)
3435
map.points[:]
3536
map.segments[:]
3637

@@ -71,8 +72,8 @@ def test_notebook(self):
7172
id
7273

7374
# abb
74-
timePoint.points["roi"].get_coordinates()
75-
timePoint.points["roiBase"].get_coordinates()['x'].tolist()
75+
# timePoint.points["roi"].get_coordinates()
76+
# timePoint.points["roiBase"].get_coordinates()['x'].tolist()
7677

7778
from mapmanagercore.schemas.spine import Spine
7879

0 commit comments

Comments
 (0)