Merge branch 'dev-v2' into benchmarking

Conflicts:
	poetry.lock
	pyproject.toml
	tianshou/highlevel/experiment.py

Author: opcode81

.github/workflows/pytest.yml

@@ -15,53 +15,94 @@ on:
         required: false
         default: false
 
+
+# This job runs the test suite in two environments:
+# - py_pinned: uses Python 3.11 with the existing poetry.lock file (our stable, pinned dev environment)
+# - py_latest: latest Python version we want to support, without the lock file to furthermore install the newest dependency versions
+#
+# This ensures compatibility with both our controlled dev setup and the latest upstream packages,
+# helping catch issues introduced by dependency updates or newer Python versions.
 jobs:
   cpu:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     strategy:
       matrix:
-        python-version: ["3.11"]
+        include:
+          - env_name: py_pinned
+            python-version: "3.11"
+            use_lock: true
+          - env_name: py_latest
+            python-version: "3.13"
+            use_lock: false
+
     steps:
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+
       - name: Cancel previous run
         uses: styfle/[email protected]
         with:
           access_token: ${{ github.token }}
+
       - uses: actions/checkout@v3
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      # use poetry and cache installed packages, see https://github.com/marketplace/actions/python-poetry-action
+
       - name: Install poetry
         uses: abatilo/actions-poetry@v2
+
       - name: Setup a local virtual environment (if no poetry.toml file)
         run: |
           poetry config virtualenvs.create true --local
           poetry config virtualenvs.in-project true --local
-      - uses: actions/cache@v3
-        name: Define a cache for the virtual environment based on the dependencies lock file
+
+      - name: Remove poetry.lock for latest dependency test
+        if: ${{ !matrix.use_lock }}
+        run: rm -f poetry.lock
+
+      - name: Define a cache for the virtual environment based on the dependencies lock file
+        if: matrix.use_lock
+        uses: actions/cache@v3
         with:
           path: ./.venv
-          key: venv-${{ hashFiles('poetry.lock') }}
+          key: venv-${{ matrix.env_name }}-${{ hashFiles('poetry.lock') }}
+          restore-keys: |
+            venv-${{ matrix.env_name }}-
+
       - name: Install the project dependencies
         run: |
-          poetry install --with dev --extras "envpool eval"
+          if [ "${{ matrix.env_name }}" = "py_latest" ]; then
+            poetry install --with dev --extras "eval"
+          else
+            poetry install --with dev --extras "envpool eval"
+          fi
+
+      - name: List installed packages
+        run: |
+          poetry run pip list
+
       - name: wandb login
         run: |
           poetry run wandb login e2366d661b89f2bee877c40bee15502d67b7abef
+
       - name: Test with pytest
-        # ignore test/throughput which only profiles the code
         run: |
-          poetry run poe test
+          if [ "${{ matrix.env_name }}" = "py_pinned" ]; then
+            poetry run poe test
+          else
+            poetry run poe test-nocov
+          fi
       - name: Upload coverage to Codecov
+        if: matrix.env_name == 'py_pinned'
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV }}
           file: ./coverage.xml
-          flags: unittests
-          name: codecov-umbrella
+          flags: ${{ matrix.env_name }}
+          name: codecov-${{ matrix.env_name }}
           fail_ci_if_error: false

CHANGELOG.md

@@ -16,6 +16,14 @@ Developers:
   * Dr. Dominik Jain (@opcode81)
   * Michael Panchenko (@MischaPanch)  
 
+### Runtime Environment Compatibility
+
+Tianshou v2 is now compatible with 
+  * Python 3.12 and Python 3.13 #1274
+  * newer versions of gymnasium (v1+) and numpy (v2+)
+
+Our main test environment remains Python 3.11-based for the time being (see `poetry.lock`).
+
 ### Trainer Abstraction
 
 * The trainer logic and configuration is now properly separated between the three cases of on-policy, off-policy
@@ -228,6 +236,9 @@ Developers:
       contain parameter `repeat_per_collect`). 
     * All parameter names have been aligned with the new names used by `TrainerParams` (see above).
 
+* Add option to customize the factory for the collector (`ExperimentBuilder.with_collector_factory`),
+  adding the abstraction `CollectorFactory`. #1256
+
 ### Peripheral Changes
 
 * The `Actor` classes have been renamed for clarity (#1091):

CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contributing to Tianshou
 
-Please refer to [tianshou.readthedocs.io/en/latest/contributing.html](https://tianshou.readthedocs.io/en/latest/contributing.html).
+Please refer to the ['Developer Guide' on tianshou.org](https://tianshou.org/en/latest/04_developer_guide/developer_guide.html).

README.md

@@ -8,7 +8,7 @@
 
 > ℹ️ **Introducing Tianshou version 2**  
 > 
-> We have just released the first beta version 2.0.0b1 of the new major version of Tianshou, and we invite you to try it!  
+> We have released the second beta version 2.0.0b2 of the new major version of Tianshou on PyPI, and we invite you to try it!  
 > Version 2 is a complete overhaul of the software design of the procedural API, in which
 >   * we establish a clear separation between learning algorithms and policies (via the separate abstractions `Algorithm` and `Policy`).
 >   * we provide more well-defined, more usable interfaces with extensive documentation of all algorithm and trainer parameters,