diff --git a/.github/workflows/main_push.yml b/.github/workflows/main_push.yml index 0d002fe..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: @@ -50,7 +54,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 f4edf37..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: @@ -23,7 +31,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 glpk-utils - name: "Install python environment" run: | 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 ------------- 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 dd703e9..c33a0dc 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-devel glpk-utils """ [[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 """ diff --git a/setup.py b/setup.py index 8d838ef..3f429d4 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,8 @@ "-DWIN32_LEAN_AND_MEAN", "-DASIO_STANDALONE", "-DUSE_PYTHON_BINDINGS", - "-DUSE_ROUTING=true" + "-DUSE_ROUTING=true", + "-DUSE_LIBGLPK=true", ] extra_link_args = [] @@ -37,12 +38,14 @@ "-DASIO_STANDALONE", "-DNDEBUG", "-DUSE_PYTHON_BINDINGS", - "-DUSE_ROUTING=true" + "-DUSE_ROUTING=true", + "-DUSE_LIBGLPK=true", ] extra_link_args = [ "-lpthread", "-lssl", "-lcrypto", + "-lglpk", ] if platform.system() == "Darwin": 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"