From 77c4b398e84cd44ee7f0bc0acb69ab4ae1970c8c Mon Sep 17 00:00:00 2001 From: Juan Luis Ruiz-Tagle Oriol Date: Mon, 10 Jul 2023 16:45:46 +0200 Subject: [PATCH 01/14] adds DUSE_LIBGLPK flag --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8d838ef..b736867 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,8 @@ "-DASIO_STANDALONE", "-DNDEBUG", "-DUSE_PYTHON_BINDINGS", - "-DUSE_ROUTING=true" + "-DUSE_ROUTING=true", + "-DUSE_LIBGLPK=true" ] extra_link_args = [ "-lpthread", From 17507f9defd4c1e96412aea0a081e69a9d252b1d Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Mon, 10 Jul 2023 18:39:21 +0200 Subject: [PATCH 02/14] adding missing dependencies --- src/_vroom.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/_vroom.cpp b/src/_vroom.cpp index 3f62b2e..2a66b54 100644 --- a/src/_vroom.cpp +++ b/src/_vroom.cpp @@ -30,7 +30,8 @@ #include "algorithms/heuristics/heuristics.cpp" #include "algorithms/local_search/local_search.cpp" #include "algorithms/local_search/operator.cpp" -#include "algorithms/validation/check.h" +#include "algorithms/validation/check.cpp" +#include "algorithms/validation/choose_ETA.cpp" // #include "routing/libosrm_wrapper.cpp" #include "routing/http_wrapper.cpp" From 72e9d54ca1843df2818b810f9b24adfd9950a26a Mon Sep 17 00:00:00 2001 From: Juan Luis Ruiz-Tagle Oriol Date: Thu, 13 Jul 2023 00:00:05 +0200 Subject: [PATCH 03/14] add glpk --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index f4edf37..cb9615e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,7 +23,7 @@ jobs: python-version: "3.7" - name: "Install system dependencies" - run: sudo apt update -y && sudo apt install -y libssl-dev libasio-dev + run: sudo apt update -y && sudo apt install -y libssl-dev libasio-dev libglpk-dev - name: "Install python environment" run: | From c0e7737c08bf7ad1eaa5cf7007cf6ab85c10cefa Mon Sep 17 00:00:00 2001 From: Juan Luis Ruiz-Tagle Oriol Date: Thu, 13 Jul 2023 11:12:32 +0200 Subject: [PATCH 04/14] adds linking flag --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index b736867..80dc0f3 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,7 @@ "-lpthread", "-lssl", "-lcrypto", + "-lglpk", ] if platform.system() == "Darwin": From a471a470ab785695164112b92943a6c465afc7a9 Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Thu, 13 Jul 2023 12:15:06 +0200 Subject: [PATCH 05/14] adding glpk to cibuildwheel --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index dd703e9..ac9d833 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ before-all = """ yum update -y yum install -y epel-release yum install -y openssl-devel asio-devel +yum install -y glpk """ [[tool.cibuildwheel.overrides]] @@ -39,10 +40,12 @@ select = "*musllinux*" before-all = """ apk add asio-dev apk add openssl-dev +apk add glpk """ [tool.cibuildwheel.macos] before-all = """ brew install asio +brew install glpk """ From 543fb8ca797ee53ed33c72622385bc93eead868d Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Thu, 13 Jul 2023 12:30:38 +0200 Subject: [PATCH 06/14] adding more glpk to cibuildwheel --- conanfile.txt | 1 + pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index 72a05a6..ce267b3 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,6 +1,7 @@ [requires] openssl/1.1.1m asio/1.21.0 +glpk/5.0 [generators] json diff --git a/pyproject.toml b/pyproject.toml index ac9d833..6437ba3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ before-all = """ yum update -y yum install -y epel-release yum install -y openssl-devel asio-devel -yum install -y glpk +yum install -y glpk glpk-utils """ [[tool.cibuildwheel.overrides]] From f03438e1813eff0cba07e812801408224da9e211 Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Thu, 13 Jul 2023 12:49:05 +0200 Subject: [PATCH 07/14] giving up on win, updating on linux --- .github/workflows/pull_request.yml | 2 +- conanfile.txt | 1 - pyproject.toml | 2 +- setup.py | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index cb9615e..cc654d6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,7 +23,7 @@ jobs: python-version: "3.7" - name: "Install system dependencies" - run: sudo apt update -y && sudo apt install -y libssl-dev libasio-dev libglpk-dev + run: sudo apt update -y && sudo apt install -y libssl-dev libasio-dev libglpk-dev glpk-utils - name: "Install python environment" run: | diff --git a/conanfile.txt b/conanfile.txt index ce267b3..72a05a6 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,6 @@ [requires] openssl/1.1.1m asio/1.21.0 -glpk/5.0 [generators] json diff --git a/pyproject.toml b/pyproject.toml index 6437ba3..c33a0dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ before-all = """ yum update -y yum install -y epel-release yum install -y openssl-devel asio-devel -yum install -y glpk glpk-utils +yum install -y glpk-devel glpk-utils """ [[tool.cibuildwheel.overrides]] diff --git a/setup.py b/setup.py index 80dc0f3..26d7ef1 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ "-DWIN32_LEAN_AND_MEAN", "-DASIO_STANDALONE", "-DUSE_PYTHON_BINDINGS", - "-DUSE_ROUTING=true" + "-DUSE_ROUTING=true", ] extra_link_args = [] @@ -38,7 +38,7 @@ "-DNDEBUG", "-DUSE_PYTHON_BINDINGS", "-DUSE_ROUTING=true", - "-DUSE_LIBGLPK=true" + "-DUSE_LIBGLPK=true", ] extra_link_args = [ "-lpthread", From f8ad93070cda894ff0c736de6c57e0c8442f25da Mon Sep 17 00:00:00 2001 From: Jonathan Feinberg Date: Thu, 13 Jul 2023 14:22:55 +0200 Subject: [PATCH 08/14] resetting conan --- conanfile.txt | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/conanfile.txt b/conanfile.txt index 72a05a6..553fb3d 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,6 +1,7 @@ [requires] openssl/1.1.1m asio/1.21.0 +glpk/5.0:127af201a4cdf8111e2e08540525c245c9b3b99e [generators] json diff --git a/setup.py b/setup.py index 26d7ef1..3f429d4 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,7 @@ "-DASIO_STANDALONE", "-DUSE_PYTHON_BINDINGS", "-DUSE_ROUTING=true", + "-DUSE_LIBGLPK=true", ] extra_link_args = [] From d2b9c04f019c2a4f5d77bdec4b86fa7998944748 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Mon, 7 Aug 2023 23:09:37 +0200 Subject: [PATCH 09/14] try without the recipe version --- conanfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.txt b/conanfile.txt index 553fb3d..ce267b3 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,7 @@ [requires] openssl/1.1.1m asio/1.21.0 -glpk/5.0:127af201a4cdf8111e2e08540525c245c9b3b99e +glpk/5.0 [generators] json From 7e611e3dc9b2cbda597cd74373cd44052e772c46 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Mon, 7 Aug 2023 23:13:01 +0200 Subject: [PATCH 10/14] trigger win --- .github/workflows/main_push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main_push.yml b/.github/workflows/main_push.yml index 0d002fe..9d4bb4b 100644 --- a/.github/workflows/main_push.yml +++ b/.github/workflows/main_push.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - nn-win-conan jobs: check-platform-builds: From f1f112d1d8dd55254188ddb971fd5bf10fb2d647 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Mon, 7 Aug 2023 23:28:14 +0200 Subject: [PATCH 11/14] conan: only build missing binary packages --- .github/workflows/main_push.yml | 2 +- .github/workflows/pull_request.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main_push.yml b/.github/workflows/main_push.yml index 9d4bb4b..20ac986 100644 --- a/.github/workflows/main_push.yml +++ b/.github/workflows/main_push.yml @@ -51,7 +51,7 @@ jobs: conan profile update "settings.compiler=Visual Studio" default conan profile update "settings.compiler.version=17" default conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data" - conan install --build=openssl --install-folder conan_build . + conan install --build=missing --install-folder conan_build . - uses: pypa/cibuildwheel@v2.3.1 env: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index cc654d6..0fd905f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -2,8 +2,8 @@ name: pull request on: pull_request: - branches: - - main + ignore-branches: + - * push: branches: - main From b487805e423521d235a112652e5e5aff2433d8f2 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Mon, 7 Aug 2023 23:43:54 +0200 Subject: [PATCH 12/14] revert workflow stuff --- .github/workflows/main_push.yml | 1 - .github/workflows/pull_request.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main_push.yml b/.github/workflows/main_push.yml index 20ac986..817b2cb 100644 --- a/.github/workflows/main_push.yml +++ b/.github/workflows/main_push.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - nn-win-conan jobs: check-platform-builds: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0fd905f..cc654d6 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -2,8 +2,8 @@ name: pull request on: pull_request: - ignore-branches: - - * + branches: + - main push: branches: - main From 112bb1592dc385c9c35712f7cebe6c08b2f13b76 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Tue, 8 Aug 2023 00:23:47 +0200 Subject: [PATCH 13/14] don't build CI on irrelevant files --- .github/workflows/main_push.yml | 4 ++++ .github/workflows/pull_request.yml | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/main_push.yml b/.github/workflows/main_push.yml index 817b2cb..ec07e94 100644 --- a/.github/workflows/main_push.yml +++ b/.github/workflows/main_push.yml @@ -4,6 +4,10 @@ on: push: branches: - main + paths-ignore: + - '.gitignore' + - 'LICENSE' + - '*.rst' jobs: check-platform-builds: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index cc654d6..638a7b5 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -4,9 +4,17 @@ on: pull_request: branches: - main + paths-ignore: + - '.gitignore' + - 'LICENSE' + - '*.rst' push: branches: - main + paths-ignore: + - '.gitignore' + - 'LICENSE' + - '*.rst' jobs: test: From 015f93dc9b203906dbacc87c8b9ca75a32a86930 Mon Sep 17 00:00:00 2001 From: nilsnolde Date: Tue, 8 Aug 2023 02:29:03 +0200 Subject: [PATCH 14/14] update readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index e7921c7..036b82f 100644 --- a/README.rst +++ b/README.rst @@ -123,7 +123,7 @@ To install using Conan, do the following: .. code:: bash cd pyvroom/ - conan install --build=openssl --install-folder conan_build . + conan install --build=missing --install-folder conan_build . Documentation -------------