Skip to content

Commit 0881676

Browse files
authored
Merge pull request #60 from neherlab/debug/export
fixes issue #59
2 parents 2d5345c + 49da837 commit 0881676

File tree

4 files changed

+78
-68
lines changed

4 files changed

+78
-68
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
\.cache
21
.dep
32
.local
43
data
@@ -14,7 +13,7 @@ pangraph.tar.gz
1413
bin
1514
tutorial
1615
playgrounds
17-
.vscode
16+
/.vscode
1817
script/synthetic_data
1918
script/panx_data
2019
script/.snakemake
@@ -25,6 +24,7 @@ script/panx_results
2524
script/local_scripts
2625
__pycache__
2726
tests/data
27+
/debug
2828

2929
deps/minimap2/build
3030
deps/minimap2/products

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# PanGraph Changelog
22

3+
## v0.7.2
4+
5+
- minor fix in tree midpoint rooting during panX export, see [#59](https://github.com/neherlab/pangraph/issues/59).
6+
37
## v0.7.1
48

59
- minor fix for multi-threaded marginalize, see [#58](https://github.com/neherlab/pangraph/pull/58).

Manifest.toml

Lines changed: 70 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,36 @@ version = "0.5.1"
2525

2626
[[deps.ChainRulesCore]]
2727
deps = ["Compat", "LinearAlgebra", "SparseArrays"]
28-
git-tree-sha1 = "e7ff6cadf743c098e08fca25c91103ee4303c9bb"
28+
git-tree-sha1 = "e30f2f4e20f7f186dc36529910beaedc60cfa644"
2929
uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
30-
version = "1.15.6"
30+
version = "1.16.0"
3131

3232
[[deps.ChangesOfVariables]]
33-
deps = ["ChainRulesCore", "LinearAlgebra", "Test"]
34-
git-tree-sha1 = "38f7a08f19d8810338d4f5085211c7dfa5d5bdd8"
33+
deps = ["InverseFunctions", "LinearAlgebra", "Test"]
34+
git-tree-sha1 = "2fba81a302a7be671aefe194f0525ef231104e7f"
3535
uuid = "9e997f8a-9a97-42d5-a9f1-ce6bfc15e2c0"
36-
version = "0.1.4"
36+
version = "0.1.8"
3737

3838
[[deps.Compat]]
3939
deps = ["Dates", "LinearAlgebra", "UUIDs"]
40-
git-tree-sha1 = "3ca828fe1b75fa84b021a7860bd039eaea84d2f2"
40+
git-tree-sha1 = "e460f044ca8b99be31d35fe54fc33a5c33dd8ed7"
4141
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
42-
version = "4.3.0"
42+
version = "4.9.0"
4343

4444
[[deps.CompilerSupportLibraries_jll]]
4545
deps = ["Artifacts", "Libdl"]
4646
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
4747

4848
[[deps.DataAPI]]
49-
git-tree-sha1 = "46d2680e618f8abd007bce0c3026cb0c4a8f2032"
49+
git-tree-sha1 = "8da84edb865b0b5b0100c0666a9bc9a0b71c553c"
5050
uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a"
51-
version = "1.12.0"
51+
version = "1.15.0"
5252

5353
[[deps.DataStructures]]
5454
deps = ["Compat", "InteractiveUtils", "OrderedCollections"]
55-
git-tree-sha1 = "d1fff3a548102f48987a52a2e0d114fa97d730f0"
55+
git-tree-sha1 = "3dbd312d370723b6bb43ba9d02fc36abade4518d"
5656
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
57-
version = "0.18.13"
57+
version = "0.18.15"
5858

5959
[[deps.Dates]]
6060
deps = ["Printf"]
@@ -78,9 +78,9 @@ version = "0.25.76"
7878

7979
[[deps.DocStringExtensions]]
8080
deps = ["LibGit2"]
81-
git-tree-sha1 = "c36550cb29cbe373e95b3f40486b9a4148f89ffd"
81+
git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
8282
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
83-
version = "0.9.2"
83+
version = "0.9.3"
8484

8585
[[deps.Documenter]]
8686
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
@@ -100,15 +100,15 @@ version = "0.6.8"
100100

101101
[[deps.FileIO]]
102102
deps = ["Pkg", "Requires", "UUIDs"]
103-
git-tree-sha1 = "7be5f99f7d15578798f338f5433b6c432ea8037b"
103+
git-tree-sha1 = "299dc33549f68299137e51e6d49a13b5b1da9673"
104104
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
105-
version = "1.16.0"
105+
version = "1.16.1"
106106

107107
[[deps.FillArrays]]
108108
deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"]
109-
git-tree-sha1 = "802bfc139833d2ba893dd9e62ba1767c88d708ae"
109+
git-tree-sha1 = "7072f1e3e5a8be51d525d64f63d3ec1287ff2790"
110110
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
111-
version = "0.13.5"
111+
version = "0.13.11"
112112

113113
[[deps.GZip]]
114114
deps = ["Libdl"]
@@ -117,31 +117,31 @@ uuid = "92fee26a-97fe-5a0c-ad85-20a5f3185b63"
117117
version = "0.5.1"
118118

119119
[[deps.HypergeometricFunctions]]
120-
deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions", "Test"]
121-
git-tree-sha1 = "709d864e3ed6e3545230601f94e11ebc65994641"
120+
deps = ["DualNumbers", "LinearAlgebra", "OpenLibm_jll", "SpecialFunctions"]
121+
git-tree-sha1 = "f218fe3736ddf977e0e772bc9a586b2383da2685"
122122
uuid = "34004b35-14d8-5ef3-9330-4cdb6864b03a"
123-
version = "0.3.11"
123+
version = "0.3.23"
124124

125125
[[deps.IOCapture]]
126126
deps = ["Logging", "Random"]
127-
git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a"
127+
git-tree-sha1 = "d75853a0bdbfb1ac815478bacd89cd27b550ace6"
128128
uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
129-
version = "0.2.2"
129+
version = "0.2.3"
130130

131131
[[deps.InteractiveUtils]]
132132
deps = ["Markdown"]
133133
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
134134

135135
[[deps.InverseFunctions]]
136136
deps = ["Test"]
137-
git-tree-sha1 = "49510dfcb407e572524ba94aeae2fced1f3feb0f"
137+
git-tree-sha1 = "68772f49f54b479fa88ace904f6127f0a3bb2e46"
138138
uuid = "3587e190-3f89-42d0-90ee-14403ec27112"
139-
version = "0.1.8"
139+
version = "0.1.12"
140140

141141
[[deps.IrrationalConstants]]
142-
git-tree-sha1 = "7fd44fd4ff43fc60815f8e764c0f352b83c49151"
142+
git-tree-sha1 = "630b497eafcc20001bba38a4651b327dcfc491d2"
143143
uuid = "92d709cd-6900-40b7-9082-c6be49f344b6"
144-
version = "0.1.1"
144+
version = "0.2.2"
145145

146146
[[deps.JLD2]]
147147
deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "TranscodingStreams", "UUIDs"]
@@ -150,10 +150,10 @@ uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
150150
version = "0.4.25"
151151

152152
[[deps.JLLWrappers]]
153-
deps = ["Preferences"]
154-
git-tree-sha1 = "abc9885a7ca2052a736a600f7fa66209f96506e1"
153+
deps = ["Artifacts", "Preferences"]
154+
git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca"
155155
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
156-
version = "1.4.1"
156+
version = "1.5.0"
157157

158158
[[deps.JSON]]
159159
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -190,18 +190,18 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
190190

191191
[[deps.LogExpFunctions]]
192192
deps = ["ChainRulesCore", "ChangesOfVariables", "DocStringExtensions", "InverseFunctions", "IrrationalConstants", "LinearAlgebra"]
193-
git-tree-sha1 = "94d9c52ca447e23eac0c0f074effbcd38830deb5"
193+
git-tree-sha1 = "7d6dd4e9212aebaeed356de34ccf262a3cd415aa"
194194
uuid = "2ab3a3ac-af41-5b50-aa03-7779005ae688"
195-
version = "0.3.18"
195+
version = "0.3.26"
196196

197197
[[deps.Logging]]
198198
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
199199

200200
[[deps.MacroTools]]
201201
deps = ["Markdown", "Random"]
202-
git-tree-sha1 = "42324d08725e200c23d4dfb549e0d5d89dede2d2"
202+
git-tree-sha1 = "9ee1618cbf5240e6d4e0371d6f24065083f60c48"
203203
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
204-
version = "0.5.10"
204+
version = "0.5.11"
205205

206206
[[deps.Markdown]]
207207
deps = ["Base64"]
@@ -213,9 +213,9 @@ uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
213213

214214
[[deps.Missings]]
215215
deps = ["DataAPI"]
216-
git-tree-sha1 = "bf210ce90b6c9eed32d25dbcae1ebc565df2687f"
216+
git-tree-sha1 = "f66bdc5de519e8f8ae43bdc598782d35a25b1272"
217217
uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
218-
version = "1.0.2"
218+
version = "1.1.0"
219219

220220
[[deps.Mmap]]
221221
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
@@ -225,9 +225,9 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
225225

226226
[[deps.NaNMath]]
227227
deps = ["OpenLibm_jll"]
228-
git-tree-sha1 = "a7c3d1da1189a1c2fe843a3bfa04d18d20eb3211"
228+
git-tree-sha1 = "0877504529a3e5c3343c6f8b4c0381e57e4387e4"
229229
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
230-
version = "1.0.1"
230+
version = "1.0.2"
231231

232232
[[deps.NetworkOptions]]
233233
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
@@ -253,9 +253,9 @@ version = "1.6.0"
253253

254254
[[deps.PDMats]]
255255
deps = ["LinearAlgebra", "SparseArrays", "SuiteSparse"]
256-
git-tree-sha1 = "cf494dca75a69712a72b80bc48f59dcf3dea63ec"
256+
git-tree-sha1 = "67eae2738d63117a196f497d7db789821bce61d1"
257257
uuid = "90014a1f-27ba-587c-ab20-58faa44d9150"
258-
version = "0.11.16"
258+
version = "0.11.17"
259259

260260
[[deps.PackageCompiler]]
261261
deps = ["Artifacts", "LazyArtifacts", "Libdl", "Pkg", "Printf", "RelocatableFolders", "TOML", "UUIDs"]
@@ -264,20 +264,26 @@ uuid = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"
264264
version = "2.1.0"
265265

266266
[[deps.Parsers]]
267-
deps = ["Dates"]
268-
git-tree-sha1 = "6c01a9b494f6d2a9fc180a08b182fcb06f0958a0"
267+
deps = ["Dates", "PrecompileTools", "UUIDs"]
268+
git-tree-sha1 = "716e24b21538abc91f6205fd1d8363f39b442851"
269269
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
270-
version = "2.4.2"
270+
version = "2.7.2"
271271

272272
[[deps.Pkg]]
273273
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
274274
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
275275

276+
[[deps.PrecompileTools]]
277+
deps = ["Preferences"]
278+
git-tree-sha1 = "03b4c25b43cb84cee5c90aa9b5ea0a78fd848d2f"
279+
uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
280+
version = "1.2.0"
281+
276282
[[deps.Preferences]]
277283
deps = ["TOML"]
278-
git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
284+
git-tree-sha1 = "7eb1686b4f04b82f96ed7a4ea5890a4f0c7a09f1"
279285
uuid = "21216c6a-2e73-6563-6e65-726566657250"
280-
version = "1.3.0"
286+
version = "1.4.0"
281287

282288
[[deps.Printf]]
283289
deps = ["Unicode"]
@@ -291,9 +297,9 @@ version = "1.7.2"
291297

292298
[[deps.QuadGK]]
293299
deps = ["DataStructures", "LinearAlgebra"]
294-
git-tree-sha1 = "97aa253e65b784fd13e83774cadc95b38011d734"
300+
git-tree-sha1 = "6ec7ac8412e83d57e313393220879ede1740f9ee"
295301
uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
296-
version = "2.6.0"
302+
version = "2.8.2"
297303

298304
[[deps.REPL]]
299305
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
@@ -328,24 +334,24 @@ version = "1.3.0"
328334

329335
[[deps.Rmath]]
330336
deps = ["Random", "Rmath_jll"]
331-
git-tree-sha1 = "bf3188feca147ce108c76ad82c2792c57abe7b1f"
337+
git-tree-sha1 = "f65dcb5fa46aee0cf9ed6274ccbd597adc49aa7b"
332338
uuid = "79098fc4-a85e-5d69-aa6a-4863f24498fa"
333-
version = "0.7.0"
339+
version = "0.7.1"
334340

335341
[[deps.Rmath_jll]]
336342
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
337-
git-tree-sha1 = "68db32dff12bb6127bac73c209881191bf0efbb7"
343+
git-tree-sha1 = "6ed52fdd3382cf21947b15e8870ac0ddbff736da"
338344
uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f"
339-
version = "0.3.0+0"
345+
version = "0.4.0+0"
340346

341347
[[deps.SHA]]
342348
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
343349

344350
[[deps.Scratch]]
345351
deps = ["Dates"]
346-
git-tree-sha1 = "f94f779c94e58bf9ea243e77a37e16d9de9126bd"
352+
git-tree-sha1 = "30449ee12237627992a99d5e30ae63e4d78cd24a"
347353
uuid = "6c6a2e73-6563-6170-7368-637461726353"
348-
version = "1.1.1"
354+
version = "1.2.0"
349355

350356
[[deps.Serialization]]
351357
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -355,29 +361,29 @@ uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
355361

356362
[[deps.SortingAlgorithms]]
357363
deps = ["DataStructures"]
358-
git-tree-sha1 = "b3363d7460f7d098ca0912c69b082f75625d7508"
364+
git-tree-sha1 = "c60ec5c62180f27efea3ba2908480f8055e17cee"
359365
uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
360-
version = "1.0.1"
366+
version = "1.1.1"
361367

362368
[[deps.SparseArrays]]
363369
deps = ["LinearAlgebra", "Random"]
364370
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
365371

366372
[[deps.SpecialFunctions]]
367373
deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"]
368-
git-tree-sha1 = "d75bda01f8c31ebb72df80a46c88b25d1c79c56d"
374+
git-tree-sha1 = "e2cfc4012a19088254b3950b85c3c1d8882d864d"
369375
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
370-
version = "2.1.7"
376+
version = "2.3.1"
371377

372378
[[deps.Statistics]]
373379
deps = ["LinearAlgebra", "SparseArrays"]
374380
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
375381

376382
[[deps.StatsAPI]]
377383
deps = ["LinearAlgebra"]
378-
git-tree-sha1 = "f9af7f195fb13589dd2e2d57fdb401717d2eb1f6"
384+
git-tree-sha1 = "45a7769a04a3cf80da1c1c7c60caf932e6f4c9f7"
379385
uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0"
380-
version = "1.5.0"
386+
version = "1.6.0"
381387

382388
[[deps.StatsBase]]
383389
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "LogExpFunctions", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
@@ -387,9 +393,9 @@ version = "0.33.21"
387393

388394
[[deps.StatsFuns]]
389395
deps = ["ChainRulesCore", "HypergeometricFunctions", "InverseFunctions", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"]
390-
git-tree-sha1 = "5783b877201a82fc0014cbf381e7e6eb130473a4"
396+
git-tree-sha1 = "f625d686d5a88bcd2b15cd81f18f98186fdc0c9a"
391397
uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
392-
version = "1.0.1"
398+
version = "1.3.0"
393399

394400
[[deps.SuiteSparse]]
395401
deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]
@@ -409,15 +415,15 @@ uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
409415

410416
[[deps.TranscodingStreams]]
411417
deps = ["Random", "Test"]
412-
git-tree-sha1 = "8a75929dcd3c38611db2f8d08546decb514fcadf"
418+
git-tree-sha1 = "9a6ae7ed916312b41236fcef7e0af564ef934769"
413419
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
414-
version = "0.9.9"
420+
version = "0.9.13"
415421

416422
[[deps.TreeTools]]
417423
deps = ["Random"]
418-
git-tree-sha1 = "f3ebeb47ecddbc6a0810afe77c89469cea7c6e5b"
424+
git-tree-sha1 = "9b93f8e4c93dcefee01e086de0160e9a15b9bd2b"
419425
uuid = "62f0eae3-8c0e-4032-a621-7756092209e5"
420-
version = "0.6.2"
426+
version = "0.6.5"
421427

422428
[[deps.UUIDs]]
423429
deps = ["Random", "SHA"]

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "PanGraph"
22
uuid = "0f9f61ca-f32c-45e1-b3bc-00138f4f8814"
33
authors = ["Nicholas Noll <[email protected]>"]
4-
version = "0.7.1"
4+
version = "0.7.2"
55

66
[deps]
77
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -24,4 +24,4 @@ TreeTools = "62f0eae3-8c0e-4032-a621-7756092209e5"
2424
minimap2_jll = "d341526d-637d-5003-8fc4-9c6812cd2b55"
2525

2626
[compat]
27-
TreeTools = ">= 0.6.2"
27+
TreeTools = "0.6.5"

0 commit comments

Comments
 (0)