Merge branch 'release/0.10.3'

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Unreleased
+## 0.10.3 - 2024-04-09
+### Added
+- Before building the project, all uncommitted changes are stashed.
+
+### Fixed
+- `uninode`
+    - `Node.Time` should now be properly used everywhere.
+
 ## 0.10.2 - 2024-03-11
 ### Added
 - `time`:

Makefile

@@ -5,15 +5,19 @@
 
 .PHONY: build develop install uninstall reinstall
 
+STASHABLE := $(shell git stash create)
+
 help: ## Show this help message.
 	@echo "Usage: make [target] ..."
 	@echo
 	@echo "Targets:"
 	@grep --color=auto -F "## " $(MAKEFILE_LIST) | grep --color=auto -F -v grep | sed -e "s/\\$$//" | sed -e "s/##//" | column -c2 -t -s :
 	@grep "##@[^ \"]*" $(MAKEFILE_LIST) | grep --color=auto -F -v grep | sed -e "s/^.*##@\\([a-zA-Z][a-zA-Z]*\\).*\$$/\1/" | sed "/^\\$$/d" | sort | uniq | xargs -I'{}' -n 1 bash -c "echo; echo {} targets:; grep '##@{}' $(MAKEFILE_LIST) | sed -e 's/##@{}//' | column -c2 -t -s :"
 
+build: ##@Build Build all.
+build: stash build-wheel unstash
 
-build: ##@Build Build a universal Python wheel.
+build-wheel: ##@Build Build a universal Python wheel.
 	python setup.py build bdist_wheel --universal
 
 develop: ##@Developer Install the package as link to this repository.
@@ -27,3 +31,16 @@ uninstall: ##@Install Uninstall the package.
 
 reinstall: ##@Install Reinstall the package
 reinstall: uninstall install
+
+stash:
+	@# --include-untracked or even --all should be here, but:
+	@#  a) I am using that for more stuff, so I have GBs of data here
+	@#  b) version.py kinda breaks that, so I it needs to be deleted right after?
+	@if test $(STASHABLE); then \
+		git stash save --quiet "Prebuild stash"; \
+	fi
+
+unstash:
+	@if test $(STASHABLE); then \
+		git stash pop --quiet; \
+	fi

autopsy/ros1_node.py

@@ -41,7 +41,7 @@ def __init__(self, name, **kwargs):
         rospy.init_node(name = name)
 
         # Part of workaround for Time.now()
-        self.Time = Time()
+        self.Time = Time
 
 
     def get_name(self):

autopsy/ros1_time.py

@@ -72,9 +72,9 @@ def to_msg(self):
     @classmethod
     def from_msg(cls, msg, **kwargs):
         """Obtain Time from a message."""
-        return cls(seconds = msg.data.secs, nanoseconds = msg.data.nsecs)
-
+        return cls(seconds = msg.secs, nanoseconds = msg.nsecs)
 
+    # TODO: Add this to ROS2 and just reimplement ROS1 Time as it is much better.
     ## Operators ##
     # Source: https://github.com/ros2/rclpy/blob/humble/rclpy/rclpy/time.py
     def __repr__(self):

package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>autopsy</name>
-  <version>0.10.2</version>
+  <version>0.10.3</version>
   <description>A set of Python utils for F1Tenth project.</description>
 
   <maintainer email="[email protected]">Jaroslav Klapálek</maintainer>