Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/main_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
push:
branches:
- main
paths-ignore:
- '.gitignore'
- 'LICENSE'
- '*.rst'

jobs:
check-platform-builds:
Expand Down Expand Up @@ -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:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@ on:
pull_request:
branches:
- main
paths-ignore:
- '.gitignore'
- 'LICENSE'
- '*.rst'
push:
branches:
- main
paths-ignore:
- '.gitignore'
- 'LICENSE'
- '*.rst'

jobs:
test:
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------
Expand Down
1 change: 1 addition & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[requires]
openssl/1.1.1m
asio/1.21.0
glpk/5.0

[generators]
json
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,20 @@ 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]]
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
"""
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []

Expand All @@ -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":
Expand Down
3 changes: 2 additions & 1 deletion src/_vroom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down