Merge branch 'master' into 890-footstepvis

utra-robosoccer · Nov 30, 2024 · 09f0f79 · 09f0f79
2 parents c50108d + 8318783
commit 09f0f79
Show file tree

Hide file tree

Showing 54 changed files with 1,289 additions and 78 deletions.
diff --git a/.github/workflows/test_pytest.yml b/.github/workflows/test_pytest.yml
@@ -52,9 +52,9 @@ jobs:
         run: |
           cd $HOME/catkin_ws/src/soccerbot
           source /opt/ros/noetic/setup.bash
-          pip3 install pyOpenSSL==23.0.0
+          pip install pyOpenSSL==23.0.0
           python3 -m pip install -U --user pip
-          pip3 install -r requirements.txt -f https://download.pytorch.org/whl/torch/ -f https://download.pytorch.org/whl/torchvision/
+          pip install -r tools/setup/requirements.txt
       - name: Build Soccerbot
         run: |
           cd $HOME/catkin_ws

diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@
 # Python compiled files
 __pycache__/
 *.pyc
-.idea
+
 # webots cache files
 soccer_webots/protos/*.cache
 soccer_webots/protos/Soccerbot_meshes/*.cache
@@ -34,3 +34,6 @@ venv/
 .mypy_cache/
 cuda-ubuntu2004.pin.1
 *.webm
+
+# vscode
+.vscode/*
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/soccerbot.iml b/.idea/soccerbot.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ x-exclude: &exclude
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-symlinks
         <<: *exclude
@@ -18,7 +18,7 @@ repos:
       - id: prettier
         <<: *exclude
   - repo: https://github.com/psf/black
-    rev: 24.3.0
+    rev: 22.3.0
     hooks:
       - id: black
         <<: *exclude
@@ -34,7 +34,7 @@ repos:
           - black
         <<: *exclude
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         <<: *exclude
@@ -57,5 +57,5 @@ repos:
 #    rev: ''  # Use the sha / tag you want to point at
 #    hooks:
 #      - id: mypy
-#        exclude: "cmake-build-debug|setup.py|external"
+#        exclude: "cmake-build-debug|setup.py|external|soccer_strategy|soccer_common|soccer_msgs|soccer_localization|soccer_description|soccer_webots|test_integration.py"
 #        args: ["--config-file","pyproject.toml"]
diff --git a/README.md b/README.md
@@ -96,3 +96,7 @@ https://github.com/dfki-ric/phobos/commit/757d7b58b41240ea4aa54e20ddd1665072e6da
 rosrun xacro xacro -o bez2.urdf bez2.xacro
 
 todo look into xrdp remote desktop
+uv pip install -r tools/setup/requirements.txt --python $(which python) --prefix $(python -m site --user-base)
+
+to compare
+uv pip install -r tools/setup/requirements.txt --python $(which python) --prefix $(python -m site --user-base) --no-cache-dir --force-reinstall
diff --git a/external/.dockerignore b/external/.dockerignore
@@ -1,24 +1,3 @@
-webots/.*
-webots/.clang-format
-webots/msys64
-webots/webots
-webots/webots.lnk
-webots/webots_debug_output.txt
-webots/util
-webots/bin/webots-bin
-webots/**/*.exe
-webots/**/*.o
-webots/**/*.d
-webots/**/*.class
-webots/**/*.so
-webots/**/*.dylib
-webots/**/*.dll
-webots/**/*.lib
-webots/**/*.a
-webots/**/*.cof
-webots/**/*.hex
-webots/**/*.pyc
-webots/**/*.gch
 GameController/.*
 GameController/build/
 hlvs_webots/controllers/referee/meshes/*