From defe0d15e4d1df4730958349e967b471ec1da63f Mon Sep 17 00:00:00 2001 From: Elliot Tower Date: Tue, 7 Nov 2023 13:08:14 -0500 Subject: [PATCH] Fix typo simple_reference docstring, fix workflows to use python 3.11 by default (#1128) Co-authored-by: Matteo Bettini <55539777+matteobettini@users.noreply.github.com> --- .github/workflows/build-docs.yml | 14 ++------------ .github/workflows/build-publish.yml | 4 ++-- .github/workflows/docs-manual-versioning.yml | 18 +++--------------- .github/workflows/docs-test.yml | 4 ++-- .github/workflows/docs-versioning.yml | 13 +------------ .github/workflows/linux-test.yml | 4 ++-- .github/workflows/linux-tutorials-test.yml | 6 +++--- .github/workflows/macos-test.yml | 8 ++++---- .github/workflows/pre-commit.yml | 6 ++++-- .../mpe/simple_reference/simple_reference.py | 2 +- 10 files changed, 24 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index bc8367dcd..ace662353 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -12,36 +12,26 @@ jobs: env: SPHINX_GITHUB_CHANGELOG_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 - + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: '3.9' - + python-version: '3.11' - name: Install dependencies run: pip install -r docs/requirements.txt - - name: Install PettingZoo run: pip install .[all] - - name: Generate environment docs run: python docs/_scripts/gen_envs_mds.py - - name: Generate environments display run: python docs/_scripts/gen_envs_display.py - - name: Build run: sphinx-build -b dirhtml -v docs _build - - name: Move 404 run: mv _build/404/index.html _build/404.html - - name: Update 404 links run: python docs/_scripts/move_404.py _build/404.html - - name: Remove .doctrees run: rm -r _build/.doctrees - - name: Upload to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 with: diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index d52c6a3ef..88079fe4e 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -33,9 +33,9 @@ jobs: platform: manylinux_x86_64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.x - name: Install dependencies diff --git a/.github/workflows/docs-manual-versioning.yml b/.github/workflows/docs-manual-versioning.yml index bde319b3f..d14b244ac 100644 --- a/.github/workflows/docs-manual-versioning.yml +++ b/.github/workflows/docs-manual-versioning.yml @@ -22,49 +22,37 @@ jobs: env: SPHINX_GITHUB_CHANGELOG_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: inputs.commit == '' - - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: inputs.commit != '' with: ref: ${{ inputs.commit }} - - uses: actions/setup-python@v4 with: - python-version: '3.9' - + python-version: '3.11' - name: Install dependencies run: pip install -r docs/requirements.txt - - name: Install PettingZoo run: pip install .[all] - - name: Generate environment docs run: python docs/_scripts/gen_envs_mds.py - - name: Generate environments display run: python docs/_scripts/gen_envs_display.py - - name: Build run: sphinx-build -b dirhtml -v docs _build - - name: Move 404 run: mv _build/404/index.html _build/404.html - - name: Update 404 links run: python docs/_scripts/move_404.py _build/404.html - - name: Remove .doctrees run: rm -r _build/.doctrees - - name: Upload to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 with: folder: _build target-folder: ${{ inputs.version }} clean: false - - name: Upload to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 if: inputs.latest diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 64c5e3917..59882c604 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -17,9 +17,9 @@ jobs: matrix: group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: '3.11' - name: Install dependencies diff --git a/.github/workflows/docs-versioning.yml b/.github/workflows/docs-versioning.yml index eb6905c4c..77d9b74e8 100644 --- a/.github/workflows/docs-versioning.yml +++ b/.github/workflows/docs-versioning.yml @@ -13,42 +13,31 @@ jobs: env: SPHINX_GITHUB_CHANGELOG_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 - + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.9' - - name: Get tag id: tag uses: dawidd6/action-get-tag@v1 with: strip_v: true - - name: Install dependencies run: pip install -r docs/requirements.txt - - name: Install PettingZoo run: pip install .[all] - - name: Generate environment docs run: python docs/_scripts/gen_envs_mds.py - - name: Generate environments display run: python docs/_scripts/gen_envs_display.py - - name: Build run: sphinx-build -b dirhtml -v docs _build - - name: Move 404 run: mv _build/404/index.html _build/404.html - - name: Update 404 links run: python docs/_scripts/move_404.py _build/404.html - - name: Remove .doctrees run: rm -r _build/.doctrees - - name: Upload to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 with: diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml index 2d25a5dde..7a7139b6b 100644 --- a/.github/workflows/linux-test.yml +++ b/.github/workflows/linux-test.yml @@ -17,9 +17,9 @@ jobs: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/linux-tutorials-test.yml b/.github/workflows/linux-tutorials-test.yml index 4de3f2d42..136056c5b 100644 --- a/.github/workflows/linux-tutorials-test.yml +++ b/.github/workflows/linux-tutorials-test.yml @@ -17,11 +17,11 @@ jobs: fail-fast: false matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] - tutorial: [Tianshou, CustomEnvironment, CleanRL, SB3/kaz, SB3/waterworld, SB3/connect_four, SB3/test, AgileRL] + tutorial: [Tianshou, CustomEnvironment, CleanRL, SB3/kaz, SB3/waterworld, SB3/connect_four, SB3/test] # TODO: add back AgileRL once issue is fixed on their end steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install dependencies and run tutorials diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ba848fd8d..b89be000f 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -12,11 +12,11 @@ jobs: macos-test: runs-on: macos-11 steps: - - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.11 - name: Install dependencies run: | pip install -e .[all] diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index c8cb6feb7..6987779c8 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -12,8 +12,10 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: '3.11' - run: pip install pre-commit - run: pre-commit --version - run: pre-commit install diff --git a/pettingzoo/mpe/simple_reference/simple_reference.py b/pettingzoo/mpe/simple_reference/simple_reference.py index a85db7f08..a934b9014 100644 --- a/pettingzoo/mpe/simple_reference/simple_reference.py +++ b/pettingzoo/mpe/simple_reference/simple_reference.py @@ -14,7 +14,7 @@ | Actions | Discrete/Continuous | | Parallel API | Yes | | Manual Control | No | -| Agents | `agents= [adversary_0, agent_0,agent_1]` | +| Agents | `agents= [agent_0, agent_1]` | | Agents | 3 | | Action Shape | (5) | | Action Values | Discrete(5)/Box(0.0, 1.0, (5)) |