From 85f9571c60329bfec25dff5783d580601dc86e78 Mon Sep 17 00:00:00 2001 From: JeanElsner Date: Sat, 27 Apr 2024 00:39:41 +0200 Subject: [PATCH 1/2] chore: support up to Python 3.12 --- .github/workflows/main.yml | 2 +- .github/workflows/pull_request.yml | 2 +- pyproject.toml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08f3402..8b1b317 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 6cdd148..ddde425 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} diff --git a/pyproject.toml b/pyproject.toml index dc43594..26e8f18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ include = [ name = "dm-robotics-panda" description = "Panda model for dm_robotics." version = "0.4.7" -requires-python = ">=3.8,<3.11" +requires-python = ">=3.8,<3.13" authors = [ { name = "Jean Elsner", email = "jean.elsner@tum.de" }, ] @@ -40,6 +40,8 @@ classifiers = [ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ] [project.optional-dependencies] From bcf2ac5fbf2700f49bded042c880ceb2a4d52a79 Mon Sep 17 00:00:00 2001 From: JeanElsner Date: Fri, 21 Jun 2024 02:30:03 +0200 Subject: [PATCH 2/2] fix: replace mutable default with factory --- src/dm_robotics/panda/parameters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dm_robotics/panda/parameters.py b/src/dm_robotics/panda/parameters.py index cfc1be9..5aa3744 100644 --- a/src/dm_robotics/panda/parameters.py +++ b/src/dm_robotics/panda/parameters.py @@ -64,5 +64,6 @@ class RobotParams: robot_ip: Optional[str] = None joint_stiffness: Sequence[float] = (600, 600, 600, 600, 250, 150, 50) joint_damping: Sequence[float] = (50, 50, 50, 20, 20, 20, 10) - collision_behavior: CollisionBehavior = CollisionBehavior() + collision_behavior: CollisionBehavior = dataclasses.field( + default_factory=lambda: CollisionBehavior()) enforce_realtime: bool = False