Poetry

.git-blame-ignore-revs

@@ -2,3 +2,7 @@
 d71897d20d9816b2c86bb23d2d8ba78a24622a8d
 # (bootstrap) use curly brackets for vars
 5c2e670137b009ec55eff5f101575bfc3652ed6c
+# (tue-get) consistent case styling
+ef656c09024fbdb65b56a80bc40e0fa15d7b8a2d
+# (bootstrap) consistent case styling
+1a66fd24500c4b9d8252eba22f7fe7fb277cefa0

ci/build-package.sh

@@ -50,24 +50,24 @@ fi
 if [[ "${ROS_VERSION}" == 1 ]]
 then
     echo -e "\e[35m\e[1mCompile the package (catkin build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && /usr/bin/python3 "$(command -v catkin)" build --this --no-status -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && (deactivate &>/dev/null; /usr/bin/python3 "$(command -v catkin)" build --this --no-status -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCATKIN_ENABLE_TESTING=OFF)'
 else
     echo -e "\e[35m\e[1mCheck for default mixin repo (colcon mixin list)\e[0m"
-    MIXIN_REPOS=$(docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon mixin list | grep -v "^- "' | tr -d '\r' | awk -F ": " '{print $1}')
+    MIXIN_REPOS=$(docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon mixin list) | grep -v "^- "' | tr -d '\r' | awk -F ": " '{print $1}')
     if ! echo -e "${MIXIN_REPOS}" | grep "^default$" -q
     then
         echo -e "\e[35m\e[1mAdd the default mixin repo (colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml)\e[0m"
-        docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml'
+        docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml)'
     else
         echo -e "\e[35m\e[1mDefault mixin repo already exists\e[0m"
     fi
 
     echo -e "\e[35m\e[1mUpdate colcon mixins (colcon mixin update)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon mixin update'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon mixin update)'
 
     echo -e "\e[35m\e[1mDeleting the merged install directory\e[0m"
     docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && rm -rf install'
 
     echo -e "\e[35m\e[1mCompile the package (colcon build --mixin rel-with-deb-info build-testing-off)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon build --packages-up-to "${PACKAGE}" --mixin rel-with-deb-info build-testing-off --event-handlers desktop_notification- status- terminal_title-'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon build --packages-up-to "${PACKAGE}" --mixin rel-with-deb-info build-testing-off --event-handlers desktop_notification- status- terminal_title-)'
 fi

ci/delete-docker-tags.py

@@ -43,7 +43,7 @@ def _get_authorization_token(self, username, password):
         Actually gets the authentication token
 
         Raises:
-            AuthenticationError: didn't login right
+            AuthenticationError: didn't log in correctly
         """
         resp = self._session.post(
             f"{DH_API}/users/login/",

ci/test-package.sh

@@ -50,21 +50,21 @@ if [[ "${ROS_VERSION}" == 1 ]]
 then
     # Build test targets
     echo -e "\e[35m\e[1mBuild test targets of this package (catkin build --this --no-deps -DCATKIN_ENABLE_TESTING=ON)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && /usr/bin/python3 "$(command -v catkin)" build --this --no-status --no-deps -DCATKIN_ENABLE_TESTING=ON'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && (deactivate &>/dev/null; /usr/bin/python3 "$(command -v catkin)" build --this --no-status --no-deps -DCATKIN_ENABLE_TESTING=ON)'
 
     # Run unit tests
     echo -e "\e[35m\e[1mRun tests on this package (catkin test --this --no-deps -DCATKIN_ENABLE_TESTING=ON)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && /usr/bin/python3 "$(command -v catkin)" test --this --no-status --no-deps -DCATKIN_ENABLE_TESTING=ON'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}"/src/"${PACKAGE}" && (deactivate &>/dev/null; /usr/bin/python3 "$(command -v catkin)" test --this --no-status --no-deps -DCATKIN_ENABLE_TESTING=ON)'
 else
     # Build test targets
     echo -e "\e[35m\e[1mBuild test targets of this package (colcon build --packages-select ${PACKAGE} --mixin rel-with-deb-info build-testing-on)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon build --packages-select "${PACKAGE}" --mixin rel-with-deb-info build-testing-on --event-handlers desktop_notification- status- terminal_title-'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon build --packages-select "${PACKAGE}" --mixin rel-with-deb-info build-testing-on --event-handlers desktop_notification- status- terminal_title-)'
 
     # Run unit tests
     echo -e "\e[35m\e[1mRun tests on this package (colcon test --packages-select ${PACKAGE} --executor sequential)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon test --packages-select "${PACKAGE}" --executor sequential --event-handlers desktop_notification- status- terminal_title- console_cohesion+'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon test --packages-select "${PACKAGE}" --executor sequential --event-handlers desktop_notification- status- terminal_title- console_cohesion+)'
 
     # Check test results
     echo -e "\e[35m\e[1mCheck test results (colcon test-result --verbose)\e[0m"
-    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && colcon test-result --verbose'
+    docker exec -t tue-env bash -c 'source ~/.bashrc; cd "${TUE_SYSTEM_DIR}" && (deactivate &>/dev/null; /usr/bin/python3 -m colcon test-result --verbose)'
 fi

dockerfiles/tue-env.Dockerfile

@@ -15,17 +15,18 @@ FROM base as builder
 # Build time arguments
 # BRANCH is the target branch if in PULL_REQUEST mode else it is the test branch
 ARG CI=false
-ARG BRANCH=
+ARG BRANCH
 ARG PULL_REQUEST=false
-ARG COMMIT=
-ARG REF_NAME=
+ARG COMMIT
+ARG REF_NAME
 # Default is empty and gives ROS1, for ROS2 use --build-arg ROS_VERSION=2
-ARG ROS_VERSION=
-ARG ROS_DISTRO=
+ARG ROS_VERSION
+ARG ROS_DISTRO
 # Default is empty and will result in the default targets repo
-ARG TARGETS_REPO=
+ARG TARGETS_REPO
 ARG CREATE_VENV=false
-ARG OAUTH2_TOKEN=
+ARG VENV_INCLUDE_SYSTEM_SITE_PACKAGES=false
+ARG OAUTH2_TOKEN
 
 # Inform scripts that no questions should be asked and set some environment
 # variables to prevent warnings and errors
@@ -79,7 +80,12 @@ RUN --mount=type=ssh,uid=1000 sed -e s/return//g -i ~/.bashrc && \
     export COMMIT=$COMMIT && \
     export REF_NAME=$REF_NAME && \
     # Run the standard installation script
-    source bootstrap.bash --ros-version="${ROS_VERSION}" --ros-distro="${ROS_DISTRO}" --create-virtualenv="${CREATE_VENV}"--targets-repo="${TARGETS_REPO}" && \
+    source bootstrap.bash \
+    --ros-version="${ROS_VERSION}" \
+    --ros-distro="${ROS_DISTRO}" \
+    --create-virtualenv="${CREATE_VENV}" \
+    --virtualenv-include-system-site-packages="${VENV_INCLUDE_SYSTEM_SITE_PACKAGES}" \
+    --targets-repo="${TARGETS_REPO}" && \
     # Make tue-env to be available to the environment
     source ~/.bashrc && \
     # Install target ros

docs/CI_Travis_Setup.md

@@ -1,42 +1,52 @@
 # Setting up SSH support on Travis CI
-The travis configuration needs changes to recurse submodules from private gitlab repository. 
+
+The travis configuration needs changes to recurse submodules from private gitlab repository.
 
 Steps to enable ssh support with travis and gitlab are as follows:
 
 ## On the local PC
-1. Generate a ssh keypair to be used with CI
-   ```
+
+1. Generate an ssh keypair to be used with CI
+
+   ```bash
    mkdir -p ~/travis
    ssh-keygen -t rsa -b 4096 -N "" -f ~/travis/deploy_key
    ```
 
-1. Add the ssh key to travis
-   ```
+2. Add the ssh key to travis
+
+   ```bash
    gem install travis
    cd <REPOSITORY>
    travis encrypt-file ~/travis/deploy_key --pro --add
    ```
+
    The last command will automatically generate and set two environment variables `encrypted_<STRING>_key` and
    `encrypted_<STRING>_iv`in the repository settings of travis. They are not to be removed.
 
-1. Change the value of `-out` option in `before_install: - openssl` to `./deploy_key`
+3. Change the value of `-out` option in `before_install: - openssl` to `./deploy_key`
 
-1. Commit the updated .travis.yml file and the generated file `deploy_key.enc`
+4. Commit the updated .travis.yml file and the generated file `deploy_key.enc`
 
 ### For targets repository
+
 1. Append the following lines to .travis.yml under `before_install`
-   ```
+
+   ```bash
    - eval "$(ssh-agent -s)"
    - chmod 600 ./deploy_key
    - ssh-add ./deploy_key
    ```
 
 ### For package repository
+
 1. Add the following lines to .travis.yml under `install`
-   ```
+
+   ```bash
    - SSH_KEY_PRIVATE=$(cat deploy_key)
    - bash install-package.sh --package=$PACKAGE --branch=$TRAVIS_BRANCH --commit=$TRAVIS_COMMIT --pullrequest=$TRAVIS_PULL_REQUEST --ssh --ssh-key="$SSH_KEY_PRIVATE"
    ```
 
 ## On GITLAB
+
 1. In the repository Settings > CI/CD > Deploy Keys, add the public key from the file ~/travis/deploy_key.pub