Merge branch 'master' into publish_from_release

Fix: The pyproject.toml was missing the new mushroom-rl dependency

.github/workflows/ensure-release-tagged.yaml

@@ -0,0 +1,26 @@
+name: Ensure Tagged Commits on Release
+
+on:
+  pull_request:
+    branches:
+      - release
+
+jobs:
+  check_tag:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Check if base commit of PR is tagged
+      run: |
+        BASE_COMMIT=$(jq -r .pull_request.base.sha < "$GITHUB_EVENT_PATH")
+        TAG=$(git tag --contains $BASE_COMMIT)
+        if [ -z "$TAG" ]; then
+          echo "Base commit of PR is not tagged. PRs onto release must be tagged with the version number."
+          exit 1
+        fi
+        echo "Base commit of PR is tagged. Check passed."
+

.github/workflows/publish-to-pypi.yml

@@ -2,29 +2,27 @@ name: Publish Python package to PyPI
 
 on:
   push:
-    tags:
-      - '*'
+    branches:
+      - release
 
 jobs:
   publish:
     name: Publish to PyPI
     runs-on: ubuntu-latest
-    if: false && startsWith(github.ref, 'refs/tags/')  # Only run on tagged commits
-
     steps:
     - name: Check out code
       uses: actions/checkout@v4
       with:
         fetch-depth: 0  # This fetches all history for all branches and tags
 
-    - name: Verify tag is on master branch
+    - name: Check if commit is tagged
       run: |
-        TAG_IS_ON_MASTER=$(git branch -r --contains ${{ github.ref }} | grep 'origin/master')
-        if [ -z "$TAG_IS_ON_MASTER" ]; then
-          echo "Tag is not on the master branch. Cancelling the workflow."
+        TAG=$(git tag --contains HEAD)
+        if [ -z "$TAG" ]; then
+          echo "Commit is not tagged. Failing the workflow."
           exit 1
         fi
-        echo "Tag is on the master branch. Proceeding with the workflow."
+        echo "Commit is tagged. Proceeding with the workflow."
 
     - name: Set up Python
       uses: actions/setup-python@v4

.github/workflows/publish-to-test-pypi.yml

@@ -1,52 +0,0 @@
-name: Publish Python package to TestPyPI
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  publish:
-    name: Publish to TestPyPI
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')  # Only run on tagged commits
-
-    steps:
-    - name: Check out code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # This fetches all history for all branches and tags
-
-    - name: Verify tag is on master branch
-      run: |
-        TAG_IS_ON_MASTER=$(git branch -r --contains ${{ github.ref }} | grep 'origin/master')
-        if [ -z "$TAG_IS_ON_MASTER" ]; then
-          echo "Tag is not on the master branch. Cancelling the workflow."
-          exit 1
-        fi
-        echo "Tag is on the master branch. Proceeding with the workflow."
-
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.x"
-
-    - name: Install pypa/build/setuptools/twine
-      run: >-
-        python3 -m
-        pip install
-        build setuptools twine
-        --user
-
-    - name: Prevent fallback onto setup.py
-      run: rm setup.py
-
-    - name: Build a binary wheel and a source tarball
-      run: python3 -m build
-
-    - name: Publish to TestPyPI
-      env:
-        TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
-      run: twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-

pyproject.toml

@@ -50,6 +50,7 @@ dmc = ["shimmy[dm-control]", "Shimmy==1.0.0"]
 box2d = ["gymnasium[box2d]>=0.26.0"]
 mujoco-legacy = ["mujoco-py>=2.1,<2.2", "cython<3"]
 jax = ["jax>=0.4.0", "jaxlib>=0.4.0"]
+mushroom-rl = ["mushroom-rl"]
 
 all = [
     # include all the optional dependencies
@@ -61,7 +62,8 @@ all = [
     "mujoco-py>=2.1,<2.2",
     "cython<3",
     "jax>=0.4.0",
-    "jaxlib>=0.4.0"
+    "jaxlib>=0.4.0",
+    "mushroom-rl",
 ]
 
 testing = [
@@ -75,5 +77,6 @@ testing = [
     "mujoco-py>=2.1,<2.2",
     "cython<3",
     "jax>=0.4.0",
-    "jaxlib>=0.4.0"
+    "jaxlib>=0.4.0",
+    "mushroom-rl",
 ]