Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pytest run on CI #1519

Merged
merged 3 commits into from
Oct 18, 2020
Merged

Fix pytest run on CI #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22e45e5
Disable dartpy build in debug mode
Oct 18, 2020
2dfef2c
Use pip version of default Python
Oct 18, 2020
44e1770
Remove debug postfix for dartpy
Oct 18, 2020
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: 3 additions & 3 deletions .azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
BUILD_TYPE: Debug
BUILD_DIR: $(Build.SourcesDirectory)
DOCKERFILE: Dockerfile.ubuntu-bionic
BUILD_DARTPY: ON
BUILD_DARTPY: OFF
steps:
- template: .ci/azure-pipelines/docker.yml

Expand All @@ -37,7 +37,7 @@ jobs:
BUILD_TYPE: Debug
BUILD_DIR: $(Build.SourcesDirectory)
DOCKERFILE: Dockerfile.ubuntu-focal
BUILD_DARTPY: ON
BUILD_DARTPY: OFF
steps:
- template: .ci/azure-pipelines/docker.yml

Expand All @@ -48,7 +48,7 @@ jobs:
variables:
BUILD_TYPE: Debug
BUILD_DIR: $(Build.SourcesDirectory)
BUILD_DARTPY: ON
BUILD_DARTPY: OFF
steps:
- script: |
'.ci/install.sh'
Expand Down
6 changes: 4 additions & 2 deletions .ci/install_osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -ex

brew update > /dev/null
brew bundle || brew bundle
brew install open-scene-graph --HEAD # install master branch until 3.7.0 is released
brew install open-scene-graph --HEAD # install master branch until 3.7.0 is released

# pagmo2: build from source until https://github.com/esa/pagmo2/issues/445 is resolved
brew install tbb
Expand All @@ -18,4 +18,6 @@ git clone https://github.com/esa/pagmo2.git -b 'v2.15.0' --single-branch --depth
make -j$(sysctl -n hw.logicalcpu) &&
make install

pip3 install -U numpy pytest
# Use pip for the default Python3 version
py_version=$(python3 -c "import sys; print('{}.{}'.format(sys.version_info[0], sys.version_info[1]))")
pip$py_version install -U numpy pytest
10 changes: 6 additions & 4 deletions .ci/script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ else
fi
while getopts ":j:" opt; do
case $opt in
j) num_threads="$OPTARG"
j)
num_threads="$OPTARG"
;;
\?) echo "Invalid option -$OPTARG" >& 2
\?)
echo "Invalid option -$OPTARG" >&2
;;
esac
done
Expand All @@ -75,7 +77,7 @@ fi
# Skip Xenial and Bionic in push builds
if [ "$IS_PULL_REQUEST" = "false" ]; then
if [ "$DOCKER_FILE" ]; then
exit 0;
exit 0
fi
fi

Expand Down Expand Up @@ -138,4 +140,4 @@ if [ "$RUN_INSTALL_TEST" = "ON" ]; then
cmake ..
make -j$num_threads
fi
fi
fi
3 changes: 3 additions & 0 deletions python/dartpy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ if(TARGET dart-collision-ode)
target_link_libraries(${pybind_module} PUBLIC dart-collision-ode)
endif()

# Remove debug postfix for dartpy
set_target_properties(${pybind_module} PROPERTIES DEBUG_POSTFIX "")

# Get the path to the bind module
set(PYBIND_MODULE $<TARGET_FILE:${pybind_module}>)

Expand Down