diff --git a/.github/actions/build-test-python/entrypoint.sh b/.github/actions/build-test-python/entrypoint.sh index fdd182aa4..23022a820 100755 --- a/.github/actions/build-test-python/entrypoint.sh +++ b/.github/actions/build-test-python/entrypoint.sh @@ -10,8 +10,7 @@ export OSQP_INCLUDE_DIR='/usr/local/include/osqp' pip3 install /github/workspace/python || (echo ">>> [ERROR] Build stage failed!" && exit 2) || exit $? echo ">>> Running all test stages..." -python3 -m unittest discover /github/workspace/python --verbose \ - || (echo ">>> [ERROR] Test stage failed!" && exit 3) || exit $? +pytest /github/workspace/python -v || (echo ">>> [ERROR] Test stage failed!" && exit 3) || exit $? echo ">>> Test stages completed successfully!" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e3d7ddd1..06b07a511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ Release Versions: - Add initialize method to Parameter class (#68) - Allow Parameter construction with empty name (#67) - Ignore data fields when copying an empty state (#71) +- Use pytest to run Python bindings tests (#70) ## 6.3.1 diff --git a/Dockerfile.base b/Dockerfile.base index 3776e1bf6..1832f4b31 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -83,7 +83,7 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # install python requirements -RUN pip3 install numpy setuptools pybind11 +RUN pip3 install pytest numpy setuptools pybind11 # install google dependencies COPY --from=google-dependencies /usr/include/gtest /usr/include/gtest diff --git a/VERSION b/VERSION index 7326c5a9d..00a741765 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.3.43 +6.3.44 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index bf7c6465f..f77622bfa 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -15,7 +15,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) endif() -find_package(control_libraries 6.3.43 CONFIG REQUIRED) +find_package(control_libraries 6.3.44 CONFIG REQUIRED) set(DEMOS_SCRIPTS task_space_control_loop diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 0b6d1ec68..20774a8ba 100644 --- a/doxygen/doxygen.conf +++ b/doxygen/doxygen.conf @@ -38,7 +38,7 @@ PROJECT_NAME = "Control Libraries" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 6.3.43 +PROJECT_NUMBER = 6.3.44 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/protocol/clproto_cpp/CMakeLists.txt b/protocol/clproto_cpp/CMakeLists.txt index e53702e31..d8e1ab20b 100644 --- a/protocol/clproto_cpp/CMakeLists.txt +++ b/protocol/clproto_cpp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(clproto VERSION 6.3.43) +project(clproto VERSION 6.3.44) # Default to C99 if(NOT CMAKE_C_STANDARD) diff --git a/python/Dockerfile.python b/python/Dockerfile.python index 96967df2e..4b3753478 100644 --- a/python/Dockerfile.python +++ b/python/Dockerfile.python @@ -23,6 +23,6 @@ RUN pip3 install . FROM build as testing COPY test test -RUN python3 -m unittest +RUN pytest CMD ["/bin/bash"] diff --git a/python/setup.py b/python/setup.py index 9796ae4dc..70c3ab315 100644 --- a/python/setup.py +++ b/python/setup.py @@ -11,7 +11,7 @@ # names of the environment variables that define osqp and openrobots include directories osqp_path_var = 'OSQP_INCLUDE_DIR' -__version__ = "6.3.43" +__version__ = "6.3.44" __libraries__ = ['state_representation', 'clproto', 'controllers', 'dynamical_systems', 'robot_model'] __include_dirs__ = ['include'] diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index fc4e9f7ef..3bc9e7974 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(control_libraries VERSION 6.3.43) +project(control_libraries VERSION 6.3.44) # Build options option(BUILD_TESTING "Build all tests." OFF)