From d1a24abcb871f3cbee8127b9cd1e040610fc62cc Mon Sep 17 00:00:00 2001
From: Louis Brunner <louis.brunner.fr@gmail.com>
Date: Mon, 31 Jul 2023 15:27:19 +0100
Subject: [PATCH 1/2] fix(ci): fix permissions on HOME

---
 Dockerfile.ci | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index 3e2fe9c07..4e0f894d7 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -1,4 +1,6 @@
 FROM ghcr.io/aica-technology/ros2-ws:humble as base
+USER ${USER}
+
 FROM base as apt-dependencies
 COPY apt-packages.tx[t] /
 
@@ -96,7 +98,7 @@ FROM base as code
 WORKDIR /src
 COPY --from=apt-dependencies /tmp/apt /
 COPY --from=dependencies /tmp/deps /usr
-COPY --chown=${USER} . /src
+COPY --chown=${USER}:${USER} . /src
 
 FROM code as build
 RUN \
@@ -116,14 +118,16 @@ RUN \
   cmake --install build --prefix /tmp/cl
 
 FROM base as python
-COPY --chown=${USER} ./python /python
+COPY --chown=${USER}:${USER} ./python /python
 COPY --from=install /tmp/cl /usr
 RUN \
   --mount=type=cache,target=${HOME}/.cache,id=pip-${TARGETPLATFORM},uid=1000 \
   python3 -m pip install --prefix=/tmp/python /python
+RUN mkdir -p /tmp/python-home/${USER}/.local/lib/python3.10/ \
+  && mv /tmp/python/local/lib/python3.10/dist-packages/ /tmp/python-home/${USER}/.local/lib/python3.10/site-packages/
 
 FROM scratch
 COPY --from=apt-dependencies /tmp/apt /
 COPY --from=dependencies /tmp/deps /usr
 COPY --from=install /tmp/cl /usr
-COPY --from=python /tmp/python/local/lib/python3.10/dist-packages/ /home/ros2/.local/lib/python3.10/site-packages/
+COPY --from=python /tmp/python-home /home

From 1ec0525f0a91e7f692aa61ca54f00842caaa1818 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 31 Jul 2023 14:29:43 +0000
Subject: [PATCH 2/2] 7.1.0 -> 7.1.1

---
 VERSION                             | 2 +-
 demos/CMakeLists.txt                | 2 +-
 doxygen/doxygen.conf                | 2 +-
 protocol/clproto_cpp/CMakeLists.txt | 2 +-
 python/setup.py                     | 2 +-
 source/CMakeLists.txt               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index a3fcc7121..21c8c7b46 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.0
+7.1.1
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index ecba6e578..77089364c 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 7.1.0 CONFIG REQUIRED)
+find_package(control_libraries 7.1.1 CONFIG REQUIRED)
 
 set(DEMOS_SCRIPTS
   task_space_control_loop
diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf
index 0b64c1ccf..f26cb5767 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 = 7.1.0
+PROJECT_NUMBER = 7.1.1
 
 # 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 32ef2a932..012a7b01c 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 7.1.0)
+project(clproto VERSION 7.1.1)
 
 # Default to C99
 if(NOT CMAKE_C_STANDARD)
diff --git a/python/setup.py b/python/setup.py
index c5d712368..d98a17e64 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__ = "7.1.0"
+__version__ = "7.1.1"
 __libraries__ = ['state_representation', 'clproto', 'controllers', 'dynamical_systems', 'robot_model']
 __include_dirs__ = ['include']
 
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 9ddf65ed6..e2850ca99 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 
-project(control_libraries VERSION 7.1.0)
+project(control_libraries VERSION 7.1.1)
 
 # Build options
 option(BUILD_TESTING "Build all tests." OFF)