From a8967c63bd1187ce1b33648ffcd023f2d1eaae8b Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:22:50 +0200 Subject: [PATCH 1/5] Python 3.12 --- .github/workflows/test.yml | 2 +- pyproject.toml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5f205a95..9b541846 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-20.04 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 }} diff --git a/pyproject.toml b/pyproject.toml index d4b42d55..34a539f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,6 +18,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', ] @@ -80,7 +81,7 @@ mo_gymnasium = [ [tool.black] line-length = 127 -target-version = ['py38', 'py39', 'py310', 'py311'] +target-version = ['py38', 'py39', 'py310', 'py311', 'py312'] include = '\.pyi?$' [tool.isort] From 3321167b89bcc01ec84d3ba07a6d59b1b274f48b Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:30:16 +0200 Subject: [PATCH 2/5] Remove forced mujoco version from tests --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b541846..05c03a6a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ 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', '3.12'] @@ -21,7 +21,6 @@ jobs: - name: Install dependencies run: | pip install pytest - pip install mujoco==2.3.2 git clone https://github.com/benelot/pybullet-gym.git pip install -e pybullet-gym sudo apt-get update From d613304c1d1cc97583d87cbba8bc6913a76f87e7 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:37:42 +0200 Subject: [PATCH 3/5] Bump pygame --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 34a539f9..e779a7c4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ mario = ["nes-py", "gym-super-mario-bros"] minecart = ["scipy >=1.7.3 "] mujoco = ["mujoco >=2.2.0", "imageio >=2.14.1"] highway = ["highway-env >=1.8"] -box2d = ["box2d-py ==2.3.5", "pygame ==2.1.3.dev8", "swig ==4.*"] +box2d = ["box2d-py ==2.3.5", "pygame >=2.1.3", "swig ==4.*"] all = [ # All dependencies above except accept-rom-license # NOTE: No need to manually remove the duplicates, setuptools automatically does that. @@ -53,7 +53,7 @@ all = [ "highway-env >= 1.9.1", # box2d "box2d-py ==2.3.5", - "pygame ==2.1.3.dev8", + "pygame >=2.1.3", "swig ==4.*", ] testing = ["pytest ==7.1.3"] From 07d2d9a9351067698812461d6ced22732881463c Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:44:30 +0200 Subject: [PATCH 4/5] Remove pymoo dep --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e779a7c4..43335c17 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,6 @@ dependencies = [ "numpy >=1.21.0,<2.0", "pygame >=2.1.0", "scipy >=1.7.3", - "pymoo >=0.6.0", ] dynamic = ["version"] From 7d688a600ba98e37528210d851c0d1b49bcf4a86 Mon Sep 17 00:00:00 2001 From: Florian Felten Date: Thu, 24 Oct 2024 11:56:52 +0200 Subject: [PATCH 5/5] Unify pygame versions --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 43335c17..f1c21e2d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ dependencies = [ "gymnasium >=1.0.0", "numpy >=1.21.0,<2.0", - "pygame >=2.1.0", + "pygame >=2.1.3", "scipy >=1.7.3", ] dynamic = ["version"]