@@ -1126,9 +1126,6 @@ def test_create_voila_manifest_multi_notebook(path, entrypoint):
1126
1126
source = "file" ,
1127
1127
)
1128
1128
1129
- bqplot_path = os .path .join ("bqplot" , "bqplot.ipynb" )
1130
- dashboard_path = os .path .join ("dashboard" , "dashboard.ipynb" )
1131
-
1132
1129
if sys .platform == "win32" :
1133
1130
bqplot_hash = "ddb4070466d3c45b2f233dd39906ddf6"
1134
1131
dashboard_hash = "b2d7dc369ac602c7d7a703b6eb868562"
@@ -1146,8 +1143,8 @@ def test_create_voila_manifest_multi_notebook(path, entrypoint):
1146
1143
},
1147
1144
"files" : {
1148
1145
"requirements.txt" : {"checksum" : "9cce1aac313043abd5690f67f84338ed" },
1149
- bqplot_path : {"checksum" : bqplot_hash },
1150
- dashboard_path : {"checksum" : dashboard_hash },
1146
+ "bqplot/bqplot.ipynb" : {"checksum" : bqplot_hash },
1147
+ "dashboard/dashboard.ipynb" : {"checksum" : dashboard_hash },
1151
1148
},
1152
1149
}
1153
1150
manifest = Manifest ()
@@ -1182,7 +1179,7 @@ def test_create_voila_manifest_multi_notebook(path, entrypoint):
1182
1179
image = None ,
1183
1180
multi_notebook = True ,
1184
1181
)
1185
- assert ans == json .loads (manifest .flattened_copy .json )
1182
+ assert json .loads (manifest .flattened_copy .json ) == ans
1186
1183
1187
1184
1188
1185
@pytest .mark .parametrize (
@@ -1345,9 +1342,6 @@ def test_make_voila_bundle_multi_notebook(
1345
1342
source = "file" ,
1346
1343
)
1347
1344
1348
- bqplot_path = os .path .join ("bqplot" , "bqplot.ipynb" )
1349
- dashboard_path = os .path .join ("dashboard" , "dashboard.ipynb" )
1350
-
1351
1345
if sys .platform == "win32" :
1352
1346
bqplot_hash = "ddb4070466d3c45b2f233dd39906ddf6"
1353
1347
dashboard_hash = "b2d7dc369ac602c7d7a703b6eb868562"
@@ -1365,8 +1359,8 @@ def test_make_voila_bundle_multi_notebook(
1365
1359
},
1366
1360
"files" : {
1367
1361
"requirements.txt" : {"checksum" : "9395f3162b7779c57c86b187fa441d96" },
1368
- bqplot_path : {"checksum" : bqplot_hash },
1369
- dashboard_path : {"checksum" : dashboard_hash },
1362
+ "bqplot/bqplot.ipynb" : {"checksum" : bqplot_hash },
1363
+ "dashboard/dashboard.ipynb" : {"checksum" : dashboard_hash },
1370
1364
},
1371
1365
}
1372
1366
if (path , entrypoint ) in (
@@ -1407,7 +1401,7 @@ def test_make_voila_bundle_multi_notebook(
1407
1401
]
1408
1402
reqs = tar .extractfile ("requirements.txt" ).read ()
1409
1403
assert reqs == b"bqplot"
1410
- assert ans == json .loads (tar .extractfile ("manifest.json" ).read ().decode ("utf-8" ))
1404
+ assert json .loads (tar .extractfile ("manifest.json" ).read ().decode ("utf-8" )) == ans
1411
1405
1412
1406
1413
1407
@pytest .mark .parametrize (
@@ -1575,8 +1569,6 @@ def test_create_html_manifest():
1575
1569
image = None ,
1576
1570
)
1577
1571
1578
- test_folder_path = os .path .join ("test_folder1" , "testfoldertext1.txt" )
1579
-
1580
1572
if sys .platform == "win32" :
1581
1573
index_hash = "0c3d8c84223089949954d069f2eef7e9"
1582
1574
txt_hash = "e6a96602853b20607831eec27dbb6cf0"
@@ -1603,7 +1595,7 @@ def test_create_html_manifest():
1603
1595
"files" : {
1604
1596
"index.html" : {"checksum" : index_hash },
1605
1597
"test1.txt" : {"checksum" : txt_hash },
1606
- test_folder_path : {"checksum" : folder_txt_hash },
1598
+ "test_folder1/testfoldertext1.txt" : {"checksum" : folder_txt_hash },
1607
1599
},
1608
1600
}
1609
1601
@@ -1712,8 +1704,6 @@ def test_create_html_manifest():
1712
1704
1713
1705
1714
1706
def test_make_html_bundle ():
1715
- folder_path = os .path .join ("test_folder1" , "testfoldertext1.txt" )
1716
-
1717
1707
if sys .platform == "win32" :
1718
1708
index_hash = "0c3d8c84223089949954d069f2eef7e9"
1719
1709
txt_hash = "e6a96602853b20607831eec27dbb6cf0"
@@ -1747,7 +1737,7 @@ def test_make_html_bundle():
1747
1737
"files" : {
1748
1738
"index.html" : {"checksum" : index_hash },
1749
1739
"test1.txt" : {"checksum" : txt_hash },
1750
- folder_path : {"checksum" : folder_txt_hash },
1740
+ "test_folder1/testfoldertext1.txt" : {"checksum" : folder_txt_hash },
1751
1741
},
1752
1742
}
1753
1743
with make_html_bundle (
0 commit comments