From ebdc6c68cd9c885ab5f677244b630714eef42a6b Mon Sep 17 00:00:00 2001
From: Darko Lukic <lukicdarkoo@gmail.com>
Date: Mon, 3 Feb 2025 14:45:06 +0100
Subject: [PATCH 1/4] Fix PyPi publishing

---
 .github/workflows/python-publish.yml | 35 +++++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index afe077d2..356851aa 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -9,23 +9,30 @@ on:
 
 jobs:
   deploy:
-
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
-
+    
+    environment:
+      name: pypi
+      url: https://pypi.org/p/urdf2webots
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.8'
-    - name: Install dependencies
+        python-version: '3.10'
+
+    - name: Install build tools
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        pip install build
+
+    - name: Build package
+      run: python -m build
+
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

From aa941974126efb5887c8b12f62c09a7087214a5e Mon Sep 17 00:00:00 2001
From: Darko Lukic <lukicdarkoo@gmail.com>
Date: Mon, 3 Feb 2025 14:48:02 +0100
Subject: [PATCH 2/4] test

---
 .github/workflows/python-publish.yml | 8 ++++++--
 .github/workflows/test.yml           | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 356851aa..ae8bde3a 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -4,8 +4,12 @@
 name: Upload Python Package
 
 on:
-  release:
-    types: [created]
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   deploy:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ac896534..c032600c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        python: ['3.9', '3.10']
+        python: ['3.10', '3.12']
     runs-on: ubuntu-latest
     env:
       CI: 1

From b25bb0007adfd6e0a098a285e6a1f3568478d2cc Mon Sep 17 00:00:00 2001
From: Darko Lukic <lukicdarkoo@gmail.com>
Date: Mon, 3 Feb 2025 14:48:38 +0100
Subject: [PATCH 3/4] test

---
 .github/workflows/python-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index ae8bde3a..3faba941 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -6,10 +6,10 @@ name: Upload Python Package
 on:
   push:
     branches:
-      - main
+      - master
   pull_request:
     branches:
-      - main
+      - master
 
 jobs:
   deploy:

From b942796c257a50aa9d02e461d282d02b0c54b204 Mon Sep 17 00:00:00 2001
From: Darko Lukic <lukicdarkoo@gmail.com>
Date: Mon, 3 Feb 2025 14:49:51 +0100
Subject: [PATCH 4/4] fix

---
 .github/workflows/python-publish.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
index 3faba941..356851aa 100644
--- a/.github/workflows/python-publish.yml
+++ b/.github/workflows/python-publish.yml
@@ -4,12 +4,8 @@
 name: Upload Python Package
 
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+  release:
+    types: [created]
 
 jobs:
   deploy: