Skip to content

Commit 163e146

Browse files
authored
Use PythonCall (#286)
- Update to ControlPlots 0.3, which uses PythonCall - Updates ControlPlots compatibility bounds across test and example projects. - Adds CondaPkg environment ignores and libexpat discovery in bin/setup_env.
1 parent a2cfec5 commit 163e146

11 files changed

Lines changed: 289 additions & 281 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,5 @@ examples_3d/Manifest.toml
9494
Manifest-v1.13.toml
9595
data/windfield_*.npz
9696
data/gui.yaml
97+
examples/.CondaPkg/
98+
examples_3d/.CondaPkg/

Manifest-v1.11.toml.default

Lines changed: 93 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
julia_version = "1.11.9"
44
manifest_format = "2.0"
5-
project_hash = "b1faf763d955cbb5585d42316c834916ca7cc9d1"
5+
project_hash = "b6c04763afc6f0257399e153aeeb299649357b2a"
66

77
[[deps.ADTypes]]
88
git-tree-sha1 = "bbc22a9a08a0ef6460041086d8a7b27940ed4ffd"
@@ -83,9 +83,9 @@ version = "1.1.2"
8383

8484
[[deps.ArrayInterface]]
8585
deps = ["Adapt", "LinearAlgebra"]
86-
git-tree-sha1 = "54f895554d05c83e3dd59f6a396671dae8999573"
86+
git-tree-sha1 = "3d0cabd25fab32390e3bcb82cd67e700aebd9816"
8787
uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
88-
version = "7.24.0"
88+
version = "7.25.0"
8989

9090
[deps.ArrayInterface.extensions]
9191
ArrayInterfaceAMDGPUExt = "AMDGPU"
@@ -296,11 +296,11 @@ git-tree-sha1 = "21d088c496ea22914fe80906eb5bce65755e5ec8"
296296
uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
297297
version = "2.5.1"
298298

299-
[[deps.Conda]]
300-
deps = ["Downloads", "JSON", "VersionParsing"]
301-
git-tree-sha1 = "8f06b0cfa4c514c7b9546756dbae91fcfbc92dc9"
302-
uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d"
303-
version = "1.10.3"
299+
[[deps.CondaPkg]]
300+
deps = ["JSON", "Markdown", "MicroMamba", "Pidfile", "Pkg", "Preferences", "Scratch", "TOML", "pixi_jll"]
301+
git-tree-sha1 = "0300af904a8c8d41ff715a60a6959136d22b8572"
302+
uuid = "992eb4ea-22a4-4c89-a5bb-47a3300528ab"
303+
version = "0.2.34"
304304

305305
[[deps.ConstructionBase]]
306306
git-tree-sha1 = "b4b092499347b18a015186eae3042f72267106cb"
@@ -318,10 +318,10 @@ version = "1.6.0"
318318
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
319319

320320
[[deps.ControlPlots]]
321-
deps = ["JLD2", "LaTeXStrings", "Pkg", "Printf", "PyPlot", "StaticArraysCore"]
322-
git-tree-sha1 = "fb1cf8d1213c9f2908f8682f58f7ec252f6cc171"
321+
deps = ["JLD2", "LaTeXStrings", "Pkg", "Printf", "PythonPlot", "StaticArraysCore"]
322+
git-tree-sha1 = "6cbab46fef00616339eb4c3e10faeb11b408a9cc"
323323
uuid = "23c2ee80-7a9e-4350-b264-8e670f12517c"
324-
version = "0.2.15"
324+
version = "0.3.0"
325325
weakdeps = ["ControlSystemsBase"]
326326

327327
[deps.ControlPlots.extensions]
@@ -451,9 +451,9 @@ version = "1.15.1"
451451

452452
[[deps.DifferentiationInterface]]
453453
deps = ["ADTypes", "LinearAlgebra"]
454-
git-tree-sha1 = "d0250552e42bf7cc36479fd38a6e30004c9e8c2b"
454+
git-tree-sha1 = "2147a95a217cc8a78ec96ee03581adf129468e49"
455455
uuid = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
456-
version = "0.7.17"
456+
version = "0.7.18"
457457

458458
[deps.DifferentiationInterface.extensions]
459459
DifferentiationInterfaceChainRulesCoreExt = "ChainRulesCore"
@@ -465,6 +465,7 @@ version = "0.7.17"
465465
DifferentiationInterfaceForwardDiffExt = ["ForwardDiff", "DiffResults"]
466466
DifferentiationInterfaceGPUArraysCoreExt = ["GPUArraysCore", "Adapt"]
467467
DifferentiationInterfaceGTPSAExt = "GTPSA"
468+
DifferentiationInterfaceHyperHessiansExt = "HyperHessians"
468469
DifferentiationInterfaceMooncakeExt = "Mooncake"
469470
DifferentiationInterfacePolyesterForwardDiffExt = ["PolyesterForwardDiff", "ForwardDiff", "DiffResults"]
470471
DifferentiationInterfaceReverseDiffExt = ["ReverseDiff", "DiffResults"]
@@ -489,6 +490,7 @@ version = "0.7.17"
489490
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
490491
GPUArraysCore = "46192b85-c4d5-4398-a991-12ede77f4527"
491492
GTPSA = "b27dd330-f138-47c5-815b-40db9dd9b6e8"
493+
HyperHessians = "06b494a0-c8e0-40cc-ad32-d99506a00a6c"
492494
Mooncake = "da2b9cff-9c12-43a0-ae48-6db2b0edb7d6"
493495
PolyesterForwardDiff = "98d1487c-24ca-40b6-b7ab-df2af84e126b"
494496
ReverseDiff = "37e2e3b7-166d-5795-8a7a-e32c996b4267"
@@ -830,9 +832,9 @@ weakdeps = ["UnPack"]
830832

831833
[[deps.JLLWrappers]]
832834
deps = ["Artifacts", "Preferences"]
833-
git-tree-sha1 = "0533e564aae234aff59ab625543145446d8b6ec2"
835+
git-tree-sha1 = "7204148362dafe5fe6a273f855b8ccbe4df8173e"
834836
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
835-
version = "1.7.1"
837+
version = "1.8.0"
836838

837839
[[deps.JSON]]
838840
deps = ["Dates", "Logging", "Parsers", "PrecompileTools", "StructUtils", "UUIDs", "Unicode"]
@@ -854,7 +856,7 @@ version = "0.2.1"
854856
deps = ["AtmosphericModels", "Dierckx", "DiffEqBase", "DiscretePIDs", "DocStringExtensions", "Interpolations", "KitePodModels", "KiteUtils", "LinearAlgebra", "LinearSolve", "Logging", "NLSolversBase", "NLsolve", "NonlinearSolve", "OrdinaryDiffEqBDF", "OrdinaryDiffEqCore", "OrdinaryDiffEqNonlinearSolve", "Parameters", "Pkg", "PrecompileTools", "REPL", "Reexport", "Rotations", "StaticArrays", "Statistics", "Sundials", "Suppressor", "WinchModels"]
855857
path = ".."
856858
uuid = "b94af626-7959-4878-9336-2adc27959007"
857-
version = "0.11.10"
859+
version = "0.11.12"
858860

859861
[[deps.KitePodModels]]
860862
deps = ["DocStringExtensions", "KiteUtils", "Reexport"]
@@ -965,9 +967,9 @@ weakdeps = ["ChainRulesCore", "SparseArrays", "Statistics"]
965967

966968
[[deps.LinearSolve]]
967969
deps = ["ArrayInterface", "ConcreteStructs", "DocStringExtensions", "EnumX", "GPUArraysCore", "InteractiveUtils", "Krylov", "Libdl", "LinearAlgebra", "MKL_jll", "Markdown", "OpenBLAS_jll", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLLogging", "SciMLOperators", "Setfield", "StaticArraysCore"]
968-
git-tree-sha1 = "42b5cb44317e89ef75dd841c9c8eba9045bf9ff0"
970+
git-tree-sha1 = "3ccb9eaa37e39f54a93d0ef1ad58491ab68dbf5b"
969971
uuid = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
970-
version = "3.75.0"
972+
version = "3.78.0"
971973

972974
[deps.LinearSolve.extensions]
973975
LinearSolveAMDGPUExt = "AMDGPU"
@@ -992,12 +994,12 @@ version = "3.75.0"
992994
LinearSolveKrylovKitExt = "KrylovKit"
993995
LinearSolveMetalExt = "Metal"
994996
LinearSolveMooncakeExt = "Mooncake"
995-
LinearSolvePETScCSRExt = ["PETSc", "SparseArrays", "SparseMatricesCSR"]
996-
LinearSolvePETScExt = ["PETSc", "SparseArrays"]
997+
LinearSolvePETScExt = ["PETSc", "SparseArrays", "SparseMatricesCSR"]
997998
LinearSolvePETScMPIExt = ["PETSc", "PartitionedArrays", "SparseArrays", "SparseMatricesCSR"]
998999
LinearSolveParUExt = ["ParU_jll", "SparseArrays"]
9991000
LinearSolvePardisoExt = ["Pardiso", "SparseArrays"]
10001001
LinearSolveRecursiveFactorizationExt = "RecursiveFactorization"
1002+
LinearSolveSTRUMPACKExt = ["SparseArrays", "STRUMPACK_jll"]
10011003
LinearSolveSparseArraysExt = "SparseArrays"
10021004
LinearSolveSparspakExt = ["SparseArrays", "Sparspak"]
10031005

@@ -1029,6 +1031,7 @@ version = "3.75.0"
10291031
Pardiso = "46dd5b70-b6fb-5a00-ae2d-e8fea33afaf2"
10301032
PartitionedArrays = "5a9dfac6-5c52-46f7-8278-5e2210713be9"
10311033
RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
1034+
STRUMPACK_jll = "86fbd0b9-476f-557c-b766-62c724b42d8c"
10321035
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
10331036
SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"
10341037
Sparspak = "e56a9233-b9d6-4f03-8d0f-1825330902ac"
@@ -1095,9 +1098,9 @@ version = "0.1.3"
10951098

10961099
[[deps.MatrixEquations]]
10971100
deps = ["LinearAlgebra", "LinearMaps"]
1098-
git-tree-sha1 = "51f3fade0b4ff2cf90b36b3312425460631abb56"
1101+
git-tree-sha1 = "cfcced8334cbd6829258f0ef883a1bc7475f6439"
10991102
uuid = "99c1a7ee-ab34-5fd5-8076-27c950a045f4"
1100-
version = "2.5.6"
1103+
version = "2.5.7"
11011104

11021105
[[deps.MatrixPencils]]
11031106
deps = ["LinearAlgebra", "MatrixEquations", "Polynomials", "Random"]
@@ -1125,6 +1128,12 @@ git-tree-sha1 = "0a7fe9ae5a02fe24e9f041d0200f6173606ce02a"
11251128
uuid = "ebf956a0-ef5e-43be-9fb1-27952996e635"
11261129
version = "1.0.4"
11271130

1131+
[[deps.MicroMamba]]
1132+
deps = ["Pkg", "Scratch", "micromamba_jll"]
1133+
git-tree-sha1 = "535656ce55266bfed0575cd051acc4f36dc869a0"
1134+
uuid = "0b3b1443-0f03-428d-bdfb-f27f9c1191ea"
1135+
version = "0.1.15"
1136+
11281137
[[deps.Missings]]
11291138
deps = ["DataAPI"]
11301139
git-tree-sha1 = "ec4f7fbeab05d7747bdf98eb74d130a2a2ed298d"
@@ -1285,10 +1294,10 @@ weakdeps = ["Adapt"]
12851294
OffsetArraysAdaptExt = "Adapt"
12861295

12871296
[[deps.OpenBLAS32_jll]]
1288-
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl"]
1289-
git-tree-sha1 = "dd0d9979377e43918a80486a562ddedcc6d9bdf3"
1297+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "libblastrampoline_jll"]
1298+
git-tree-sha1 = "565175ce692c065e50ad32efbb61ba69b1586593"
12901299
uuid = "656ef2d0-ae68-5445-9ca0-591084a874a2"
1291-
version = "0.3.33+0"
1300+
version = "0.3.33+1"
12921301

12931302
[[deps.OpenBLAS_jll]]
12941303
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
@@ -1382,6 +1391,12 @@ git-tree-sha1 = "5d5e0a78e971354b1c7bff0655d11fdc1b0e12c8"
13821391
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
13831392
version = "2.8.4"
13841393

1394+
[[deps.Pidfile]]
1395+
deps = ["FileWatching", "Test"]
1396+
git-tree-sha1 = "2d8aaf8ee10df53d0dfb9b8ee44ae7c04ced2b03"
1397+
uuid = "fa939f87-e72e-5be4-a000-7fc836dbe307"
1398+
version = "1.3.0"
1399+
13851400
[[deps.Pkg]]
13861401
deps = ["Artifacts", "Dates", "Downloads", "FileWatching", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "Random", "SHA", "TOML", "Tar", "UUIDs", "p7zip_jll"]
13871402
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -1471,17 +1486,25 @@ git-tree-sha1 = "4fbbafbc6251b883f4d2705356f3641f3652a7fe"
14711486
uuid = "43287f4e-b6f4-7ad1-bb20-aadabca52c3d"
14721487
version = "1.4.0"
14731488

1474-
[[deps.PyCall]]
1475-
deps = ["Conda", "Dates", "Libdl", "LinearAlgebra", "MacroTools", "Serialization", "VersionParsing"]
1476-
git-tree-sha1 = "9816a3826b0ebf49ab4926e2b18842ad8b5c8f04"
1477-
uuid = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
1478-
version = "1.96.4"
1489+
[[deps.PythonCall]]
1490+
deps = ["CondaPkg", "Dates", "Libdl", "MacroTools", "Markdown", "Pkg", "Serialization", "Tables", "UnsafePointers"]
1491+
git-tree-sha1 = "982f3f017f08d31202574ef6bdcf8b3466430bea"
1492+
uuid = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
1493+
version = "0.9.31"
14791494

1480-
[[deps.PyPlot]]
1481-
deps = ["Colors", "LaTeXStrings", "PyCall", "Sockets", "Test", "VersionParsing"]
1482-
git-tree-sha1 = "d2c2b8627bbada1ba00af2951946fb8ce6012c05"
1483-
uuid = "d330b81b-6aea-500a-939a-2ce795aea3ee"
1484-
version = "2.11.6"
1495+
[deps.PythonCall.extensions]
1496+
CategoricalArraysExt = "CategoricalArrays"
1497+
PyCallExt = "PyCall"
1498+
1499+
[deps.PythonCall.weakdeps]
1500+
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
1501+
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
1502+
1503+
[[deps.PythonPlot]]
1504+
deps = ["Colors", "CondaPkg", "LaTeXStrings", "PythonCall", "Sockets", "Test", "VersionParsing"]
1505+
git-tree-sha1 = "409884283434a04092ddf1d9594c22bc097d5d9a"
1506+
uuid = "274fc56d-3b97-40fa-a1cd-1b4a50311bf9"
1507+
version = "1.0.6"
14851508

14861509
[[deps.Quaternions]]
14871510
deps = ["LinearAlgebra", "Random", "RealDot"]
@@ -1612,6 +1635,11 @@ git-tree-sha1 = "330289636fb8107c5f32088d2741e9fd7a061a5c"
16121635
uuid = "94e857df-77ce-4151-89e5-788b33177be4"
16131636
version = "0.1.0"
16141637

1638+
[[deps.SafeTestsets]]
1639+
git-tree-sha1 = "81ec49d645af090901120a1542e67ecbbe044db3"
1640+
uuid = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
1641+
version = "0.1.0"
1642+
16151643
[[deps.SciMLBase]]
16161644
deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "Moshi", "PreallocationTools", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLLogging", "SciMLOperators", "SciMLPublic", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"]
16171645
git-tree-sha1 = "a017ed325ac5e11438c888864fe83b124bb171b7"
@@ -1665,9 +1693,9 @@ version = "0.1.13"
16651693

16661694
[[deps.SciMLLogging]]
16671695
deps = ["Logging", "LoggingExtras", "Preferences"]
1668-
git-tree-sha1 = "0161be062570af4042cf6f69e3d5d0b0555b6927"
1696+
git-tree-sha1 = "4e1e21f14a284f892eb62923a356c70a2a0c68e1"
16691697
uuid = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1"
1670-
version = "1.9.1"
1698+
version = "1.10.1"
16711699

16721700
[deps.SciMLLogging.extensions]
16731701
SciMLLoggingTracyExt = "Tracy"
@@ -1676,16 +1704,21 @@ version = "1.9.1"
16761704
Tracy = "e689c965-62c8-4b79-b2c5-8359227902fd"
16771705

16781706
[[deps.SciMLOperators]]
1679-
deps = ["Accessors", "ArrayInterface", "DocStringExtensions", "LinearAlgebra"]
1680-
git-tree-sha1 = "4a3bd21622633a70fde04bc6d072f59e482ff66f"
1707+
deps = ["Accessors", "Adapt", "ArrayInterface", "DocStringExtensions", "LinearAlgebra", "SafeTestsets"]
1708+
git-tree-sha1 = "50e6ec6879eab12b039924d5a10b91c95bf9bf7f"
16811709
uuid = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
1682-
version = "1.18.0"
1683-
weakdeps = ["SparseArrays", "StaticArraysCore"]
1710+
version = "1.21.0"
16841711

16851712
[deps.SciMLOperators.extensions]
1713+
SciMLOperatorsLoopVectorizationExt = "LoopVectorization"
16861714
SciMLOperatorsSparseArraysExt = "SparseArrays"
16871715
SciMLOperatorsStaticArraysCoreExt = "StaticArraysCore"
16881716

1717+
[deps.SciMLOperators.weakdeps]
1718+
LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
1719+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1720+
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
1721+
16891722
[[deps.SciMLPublic]]
16901723
git-tree-sha1 = "0ba076dbdce87ba230fff48ca9bca62e1f345c9b"
16911724
uuid = "431bcebd-1456-4ced-9d72-93c2757fff0b"
@@ -2045,6 +2078,11 @@ version = "1.0.2"
20452078
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
20462079
version = "1.11.0"
20472080

2081+
[[deps.UnsafePointers]]
2082+
git-tree-sha1 = "c81331b3b2e60a982be57c046ec91f599ede674a"
2083+
uuid = "e17b2a0c-0bdf-430a-bd0c-3a23cae4ff39"
2084+
version = "1.0.0"
2085+
20482086
[[deps.VersionParsing]]
20492087
git-tree-sha1 = "58d6e80b4ee071f5efd07fda82cb9fbe17200868"
20502088
uuid = "81def892-9a0e-5fdd-b105-ffc91e053289"
@@ -2101,18 +2139,30 @@ deps = ["Artifacts", "Libdl"]
21012139
uuid = "8e850b90-86db-534c-a0d3-1478176c7d93"
21022140
version = "5.11.0+0"
21032141

2142+
[[deps.micromamba_jll]]
2143+
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"]
2144+
git-tree-sha1 = "717df6f6892af4ee13279a73aa58474e58a88667"
2145+
uuid = "f8abcde7-e9b7-5caa-b8af-a437887ae8e4"
2146+
version = "2.3.1+0"
2147+
21042148
[[deps.nghttp2_jll]]
21052149
deps = ["Artifacts", "Libdl"]
21062150
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
21072151
version = "1.59.0+0"
21082152

21092153
[[deps.oneTBB_jll]]
21102154
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"]
2111-
git-tree-sha1 = "1350188a69a6e46f799d3945beef36435ed7262f"
2155+
git-tree-sha1 = "da8c1f6eee04831f14edcfa5dae611d309807e57"
21122156
uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e"
2113-
version = "2022.0.0+1"
2157+
version = "2022.3.0+0"
21142158

21152159
[[deps.p7zip_jll]]
21162160
deps = ["Artifacts", "Libdl"]
21172161
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
21182162
version = "17.4.0+2"
2163+
2164+
[[deps.pixi_jll]]
2165+
deps = ["Artifacts", "JLLWrappers", "LazyArtifacts", "Libdl"]
2166+
git-tree-sha1 = "f349584316617063160a947a82638f7611a8ef0f"
2167+
uuid = "4d7b5844-a134-5dcd-ac86-c8f19cd51bed"
2168+
version = "0.41.3+0"

0 commit comments

Comments
 (0)