From db9ee577afebb63cd4cb5b0fc8ddd03c5bf08298 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:51:00 +0200 Subject: [PATCH 1/6] Add python 3.12 --- .github/workflows/test.yml | 5 ++--- pyproject.toml | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index aeec166f..22e40116 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,10 +8,10 @@ on: jobs: linux-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -23,7 +23,6 @@ jobs: pip install pytest sudo apt-get update sudo apt-get install libglu1-mesa-dev libgl1-mesa-dev libosmesa6-dev xvfb patchelf ffmpeg cmake swig - # pip install git+https://github.com/Farama-Foundation/PettingZoo.git pip install -e .[all] - name: Full Python tests run: | diff --git a/pyproject.toml b/pyproject.toml index 6009823f..10efb7d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,6 +27,7 @@ classifiers = [ "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", 'Intended Audience :: Science/Research', 'Topic :: Scientific/Engineering :: Artificial Intelligence', ] @@ -105,7 +106,7 @@ momaland = [ [tool.black] line-length = 127 -target-version = ['py38', 'py39', 'py310', 'py311'] +target-version = ['py38', 'py39', 'py310', 'py311', 'py312'] include = '\.pyi?$' [tool.isort] From cbd9edf160b68a7aab1f8635079b8b01812ddab4 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:56:23 +0200 Subject: [PATCH 2/6] Bump pygame" --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 10efb7d5..723d71c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ dependencies = [ "numpy >=1.21.0", "networkx >=3.1", "sympy >=1.12", - "pygame >=2.0.1", + "pygame >=2.1.3", "PyOpenGL ==3.1.6", "PyOpenGL-accelerate >=3.1.1", "pillow >=8.3.1", From 657522f98e98a10b8899c3afdb139126f3623830 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 12:13:49 +0200 Subject: [PATCH 3/6] bump pyopengl --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 723d71c5..095ea041 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,8 +37,8 @@ dependencies = [ "numpy >=1.21.0", "networkx >=3.1", "sympy >=1.12", - "pygame >=2.1.3", - "PyOpenGL ==3.1.6", + "pygame >=2.6.0", + "PyOpenGL >=3.1.6", "PyOpenGL-accelerate >=3.1.1", "pillow >=8.3.1", "wandb >=0.16.1", From 350d86520f922de3c6aa91b0f0cf1f3ed8d5dd06 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 16:27:55 +0200 Subject: [PATCH 4/6] add uv --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22e40116..95a4aeed 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,10 +20,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - pip install pytest + pip install uv + uv pip install --system pytest sudo apt-get update sudo apt-get install libglu1-mesa-dev libgl1-mesa-dev libosmesa6-dev xvfb patchelf ffmpeg cmake swig - pip install -e .[all] + uv pip install --system -e .[all] - name: Full Python tests run: | pytest tests/test_envs.py From dae60817d245edb7a560c1a2079a46dea81f39a6 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 16:36:11 +0200 Subject: [PATCH 5/6] Specify leat PZ version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 095ea041..0018fa36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ classifiers = [ ] dependencies = [ "gymnasium >=0.28", - "pettingzoo[sisl,butterfly]", + "pettingzoo[sisl,butterfly] >=1.24", "numpy >=1.21.0", "networkx >=3.1", "sympy >=1.12", From ab7293a6be0479685c37cd9c82a4f42486005af2 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 17:07:37 +0200 Subject: [PATCH 6/6] Add supported python versions to readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9de34bfe..4811741c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +[![Python](https://img.shields.io/pypi/pyversions/momaland.svg)](https://badge.fury.io/py/momaland) +[![PyPI](https://badge.fury.io/py/momaland.svg)](https://badge.fury.io/py/momaland) ![tests](https://github.com/rradules/momaland/workflows/Python%20tests/badge.svg) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://pre-commit.com/) [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)