From 3693910d7a056cee0aa2e74bc94014e917011335 Mon Sep 17 00:00:00 2001 From: Adrien Banse <45042779+adrienbanse@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:05:01 +0100 Subject: [PATCH 1/8] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..c5ac017e0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Dionysos + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From c24ba8f4a1acefea8c978abbc4bcf3707f3579b2 Mon Sep 17 00:00:00 2001 From: Adrien Banse <45042779+adrienbanse@users.noreply.github.com> Date: Mon, 19 Feb 2024 08:24:12 +0100 Subject: [PATCH 2/8] Update LICENSE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: BenoƮt Legat --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c5ac017e0..a04cf25d0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Dionysos +Copyright (c) 2024: Contributors to Dionysos: https://github.com/dionysos-dev/Dionysos.jl/contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 0c5b039a12590c0401b126c24769dd3e3a755e65 Mon Sep 17 00:00:00 2001 From: adrienbanse Date: Mon, 19 Feb 2024 08:49:17 +0100 Subject: [PATCH 3/8] change .toml --- Project.toml | 4 ++-- docs/Project.toml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index f925883f2..a9fae1b2e 100644 --- a/Project.toml +++ b/Project.toml @@ -84,8 +84,8 @@ Mosek = "6405355b-0ac2-5fba-af84-adbd65488c0e" MosekTools = "1ec41992-ff65-5c91-ac43-2df89e9693a4" OSQP = "ab2f91bb-94b4-55e3-9ba0-7f65df51de79" Pavito = "cd433a01-47d1-575d-afb7-6db927ee8d8f" -SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc" [targets] -test = ["CDDLib", "Ipopt", "OSQP", "Pavito", "SDPA", "Test", "HiGHS", "Mosek", "MosekTools"] +test = ["CDDLib", "Ipopt", "OSQP", "Pavito", "Test", "HiGHS", "Mosek", "MosekTools", "SDPA"] diff --git a/docs/Project.toml b/docs/Project.toml index 0c80a06e6..b51612f2c 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -31,5 +31,4 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -Documenter = "1" -Libtiff_jll = "4.4.0" +Documenter = "1" \ No newline at end of file From 7537244e203626f3fe78d164978cae07d040ab69 Mon Sep 17 00:00:00 2001 From: adrienbanse Date: Mon, 19 Feb 2024 09:14:35 +0100 Subject: [PATCH 4/8] Implement https://github.com/jump-dev/SDPA.jl/pull/57/files --- Project.toml | 9 ++++++--- docs/Project.toml | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Project.toml b/Project.toml index a9fae1b2e..6daaa8900 100644 --- a/Project.toml +++ b/Project.toml @@ -6,6 +6,7 @@ version = "0.0.1" [deps] ArnoldiMethod = "ec485272-7323-5ecc-a04f-4719b315124d" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" +CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" DiscreteMarkovChains = "8abcb7ef-b365-4f7b-ac38-56893fb62f9f" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" @@ -33,6 +34,7 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" RigidBodyDynamics = "366cf18f-59d5-5db9-a4de-86a9f6786172" +SDPA_jll = "7fc90fd6-dbef-5a6a-93f8-169f2a2e705b" SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204" SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" @@ -44,6 +46,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] ArnoldiMethod = "0.2" Colors = "0.12" +CxxWrap = "0.13" DataStructures = "0.18" DiscreteMarkovChains = "0.2" Distributions = "0.25" @@ -73,8 +76,8 @@ SimpleWeightedGraphs = "1.2" SpecialFunctions = "2" StaticArrays = "1" Suppressor = "0.2" -Symbolics = "5" -julia = "1.6" +Symbolics = "5" +SDPA_jll = "=700.300.801, =700.301.800" [extras] CDDLib = "3391f64e-dcde-5f30-b752-e11513730f60" @@ -84,8 +87,8 @@ Mosek = "6405355b-0ac2-5fba-af84-adbd65488c0e" MosekTools = "1ec41992-ff65-5c91-ac43-2df89e9693a4" OSQP = "ab2f91bb-94b4-55e3-9ba0-7f65df51de79" Pavito = "cd433a01-47d1-575d-afb7-6db927ee8d8f" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] test = ["CDDLib", "Ipopt", "OSQP", "Pavito", "Test", "HiGHS", "Mosek", "MosekTools", "SDPA"] diff --git a/docs/Project.toml b/docs/Project.toml index b51612f2c..60ed48395 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -29,6 +29,10 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb" Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" +SDPA_jll = "7fc90fd6-dbef-5a6a-93f8-169f2a2e705b" [compat] -Documenter = "1" \ No newline at end of file +Documenter = "1" +CxxWrap = "0.13" +SDPA_jll = "=700.300.801, =700.301.800" From 5dbf96ff4e2e28ee26e1f9f4c2e6d3b5504dfa8b Mon Sep 17 00:00:00 2001 From: adrienbanse Date: Mon, 19 Feb 2024 09:16:30 +0100 Subject: [PATCH 5/8] fix cxxwrap compat --- Project.toml | 2 +- docs/Project.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index 6daaa8900..b3f070b0c 100644 --- a/Project.toml +++ b/Project.toml @@ -46,7 +46,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] ArnoldiMethod = "0.2" Colors = "0.12" -CxxWrap = "0.13" +CxxWrap = "0.12, 0.13" DataStructures = "0.18" DiscreteMarkovChains = "0.2" Distributions = "0.25" diff --git a/docs/Project.toml b/docs/Project.toml index 60ed48395..b1c3ddfa7 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -34,5 +34,5 @@ SDPA_jll = "7fc90fd6-dbef-5a6a-93f8-169f2a2e705b" [compat] Documenter = "1" -CxxWrap = "0.13" +CxxWrap = "0.12, 0.13" SDPA_jll = "=700.300.801, =700.301.800" From 16d0b4e683f5914c449a8ea1478ac010fa316cd1 Mon Sep 17 00:00:00 2001 From: adrienbanse Date: Mon, 19 Feb 2024 09:23:22 +0100 Subject: [PATCH 6/8] Revert "fix cxxwrap compat" This reverts commit 5dbf96ff4e2e28ee26e1f9f4c2e6d3b5504dfa8b. --- Project.toml | 2 +- docs/Project.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index b3f070b0c..6daaa8900 100644 --- a/Project.toml +++ b/Project.toml @@ -46,7 +46,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] ArnoldiMethod = "0.2" Colors = "0.12" -CxxWrap = "0.12, 0.13" +CxxWrap = "0.13" DataStructures = "0.18" DiscreteMarkovChains = "0.2" Distributions = "0.25" diff --git a/docs/Project.toml b/docs/Project.toml index b1c3ddfa7..60ed48395 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -34,5 +34,5 @@ SDPA_jll = "7fc90fd6-dbef-5a6a-93f8-169f2a2e705b" [compat] Documenter = "1" -CxxWrap = "0.12, 0.13" +CxxWrap = "0.13" SDPA_jll = "=700.300.801, =700.301.800" From 079455ffb98f0656b7bdbe54ac6667dd307c545e Mon Sep 17 00:00:00 2001 From: adrienbanse Date: Mon, 19 Feb 2024 09:23:28 +0100 Subject: [PATCH 7/8] Revert "Implement https://github.com/jump-dev/SDPA.jl/pull/57/files" This reverts commit 7537244e203626f3fe78d164978cae07d040ab69. --- Project.toml | 9 +++------ docs/Project.toml | 6 +----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Project.toml b/Project.toml index 6daaa8900..a9fae1b2e 100644 --- a/Project.toml +++ b/Project.toml @@ -6,7 +6,6 @@ version = "0.0.1" [deps] ArnoldiMethod = "ec485272-7323-5ecc-a04f-4719b315124d" Colors = "5ae59095-9a9b-59fe-a467-6f913c188581" -CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" DiscreteMarkovChains = "8abcb7ef-b365-4f7b-ac38-56893fb62f9f" Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" @@ -34,7 +33,6 @@ Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" RigidBodyDynamics = "366cf18f-59d5-5db9-a4de-86a9f6786172" -SDPA_jll = "7fc90fd6-dbef-5a6a-93f8-169f2a2e705b" SemialgebraicSets = "8e049039-38e8-557d-ae3a-bc521ccf6204" SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" @@ -46,7 +44,6 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] ArnoldiMethod = "0.2" Colors = "0.12" -CxxWrap = "0.13" DataStructures = "0.18" DiscreteMarkovChains = "0.2" Distributions = "0.25" @@ -76,8 +73,8 @@ SimpleWeightedGraphs = "1.2" SpecialFunctions = "2" StaticArrays = "1" Suppressor = "0.2" -Symbolics = "5" -SDPA_jll = "=700.300.801, =700.301.800" +Symbolics = "5" +julia = "1.6" [extras] CDDLib = "3391f64e-dcde-5f30-b752-e11513730f60" @@ -87,8 +84,8 @@ Mosek = "6405355b-0ac2-5fba-af84-adbd65488c0e" MosekTools = "1ec41992-ff65-5c91-ac43-2df89e9693a4" OSQP = "ab2f91bb-94b4-55e3-9ba0-7f65df51de79" Pavito = "cd433a01-47d1-575d-afb7-6db927ee8d8f" -SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc" [targets] test = ["CDDLib", "Ipopt", "OSQP", "Pavito", "Test", "HiGHS", "Mosek", "MosekTools", "SDPA"] diff --git a/docs/Project.toml b/docs/Project.toml index 60ed48395..b51612f2c 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -29,10 +29,6 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb" Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4" -SDPA_jll = "7fc90fd6-dbef-5a6a-93f8-169f2a2e705b" [compat] -Documenter = "1" -CxxWrap = "0.13" -SDPA_jll = "=700.300.801, =700.301.800" +Documenter = "1" \ No newline at end of file From 7dfe1c34885dd1c2bb884a9022c37ed6401fa884 Mon Sep 17 00:00:00 2001 From: adrienbanse Date: Mon, 19 Feb 2024 09:23:41 +0100 Subject: [PATCH 8/8] Revert "change .toml" This reverts commit 0c5b039a12590c0401b126c24769dd3e3a755e65. --- Project.toml | 4 ++-- docs/Project.toml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index a9fae1b2e..f925883f2 100644 --- a/Project.toml +++ b/Project.toml @@ -84,8 +84,8 @@ Mosek = "6405355b-0ac2-5fba-af84-adbd65488c0e" MosekTools = "1ec41992-ff65-5c91-ac43-2df89e9693a4" OSQP = "ab2f91bb-94b4-55e3-9ba0-7f65df51de79" Pavito = "cd433a01-47d1-575d-afb7-6db927ee8d8f" -Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" SDPA = "b9a10b5b-afa4-512f-a053-bb3d8080febc" +Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["CDDLib", "Ipopt", "OSQP", "Pavito", "Test", "HiGHS", "Mosek", "MosekTools", "SDPA"] +test = ["CDDLib", "Ipopt", "OSQP", "Pavito", "SDPA", "Test", "HiGHS", "Mosek", "MosekTools"] diff --git a/docs/Project.toml b/docs/Project.toml index b51612f2c..0c80a06e6 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -31,4 +31,5 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] -Documenter = "1" \ No newline at end of file +Documenter = "1" +Libtiff_jll = "4.4.0"