diff --git a/.github/workflows/build-docs-dev.yml b/.github/workflows/build-docs-dev.yml index 7a6b0ac..652cf52 100644 --- a/.github/workflows/build-docs-dev.yml +++ b/.github/workflows/build-docs-dev.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.12' - name: Install docs requirements run: pip install -r docs/requirements.txt diff --git a/.github/workflows/build-docs-version.yml b/.github/workflows/build-docs-version.yml index 7e47460..e771408 100644 --- a/.github/workflows/build-docs-version.yml +++ b/.github/workflows/build-docs-version.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.12' - name: Install docs requirements run: pip install -r docs/requirements.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e03e202..10dd404 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} diff --git a/README.md b/README.md index 4811741..5629ffd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![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) +![tests](https://github.com/Farama-Foundation/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) diff --git a/docs/index.md b/docs/index.md index c7660d1..30e7348 100644 --- a/docs/index.md +++ b/docs/index.md @@ -40,9 +40,9 @@ tutorials/learning_algorithms :caption: Development Discord -Github +Github release_notes -Contribute to the Docs +Contribute to the Docs ``` ```{project-logo} _static/img/momaland-text.png diff --git a/docs/requirements.txt b/docs/requirements.txt index b3b5a79..b929f25 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ cython gymnasium -git+https://github.com/rradules/momaland +git+https://github.com/Farama-Foundation/MOMAland tqdm sphinx sphinx-autobuild diff --git a/momaland/learning/cooperative_momappo/exec_policy.py b/momaland/learning/cooperative_momappo/exec_policy.py index 2f8c981..3a83b93 100644 --- a/momaland/learning/cooperative_momappo/exec_policy.py +++ b/momaland/learning/cooperative_momappo/exec_policy.py @@ -53,7 +53,11 @@ def main(): if args.continuous: from momaland.learning.cooperative_momappo.continuous_momappo import Actor - actor_module = Actor(single_action_space.shape[0], net_arch=args.actor_net_arch, activation=args.activation) + actor_module = Actor( + single_action_space.shape[0], + net_arch=args.actor_net_arch, + activation=args.activation, + ) actor_state = TrainState.create( apply_fn=actor_module.apply, params=actor_module.init(actor_key, dummy_local_obs_and_id), @@ -65,7 +69,11 @@ def main(): else: from momaland.learning.cooperative_momappo.discrete_momappo import Actor - actor_module = Actor(single_action_space.shape[0], net_arch=args.actor_net_arch, activation=args.activation) + actor_module = Actor( + single_action_space.shape[0], + net_arch=args.actor_net_arch, + activation=args.activation, + ) actor_state = TrainState.create( apply_fn=actor_module.apply, params=actor_module.init(actor_key, dummy_local_obs_and_id), diff --git a/pyproject.toml b/pyproject.toml index 39b1d6e..6e0598d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,16 +6,10 @@ build-backend = "setuptools.build_meta" name = "momaland" description="A standard API for Multi-Objective Multi-Agent Decision making and a diverse set of reference environments." readme = "README.md" -requires-python = ">= 3.9" +requires-python = ">= 3.10" authors = [ - {name="Florian Felten", email="florian.felten@uni.lu"}, - {name="Umut Ucak"}, - {name="Hicham Azmani", email="hicham.azmani@vub.be"}, + {name="Florian Felten", email="ffelten@mavt.ethz.ch"}, {name="Roxana Radulescu", email="r.t.radulescu@uu.nl"}, - {name="Hendrik J. S. Baier", email="h.j.s.baier@tue.nl"}, - {name="Willem Röpke", email="willem.ropke@vub.be"}, - {name="Patrick Mannion", email="patrick.mannion@universityofgalway.ie"}, - {name="Diederik M. Roijers",email="diederik.roijers@vub.be"}, ] license = { text = "GNU General Public License v3.0" } keywords = ["Reinforcement Learning", "Multi-Objective", "Multi-Agent", "RL", "AI", "gymnasium", "pettingzoo"] @@ -23,7 +17,6 @@ classifiers = [ "Development Status :: 4 - Beta", # change to `5 - Production/Stable` when ready "License :: OSI Approved :: MIT License", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", @@ -36,7 +29,7 @@ dependencies = [ "numpy >=1.21.0", "networkx >=3.1", "sympy >=1.12", - "pygame >=2.6.0", + "pygame >=2.3.0", "PyOpenGL >=3.1.6", "PyOpenGL-accelerate >=3.1.1", "pillow >=8.3.1", @@ -47,46 +40,30 @@ dynamic = ["version"] [project.optional-dependencies] # Update dependencies in `all` if any are added or removed learning = [ - "jax >=0.4.13", - "chex >=0.1", - "distrax >= 0.1.3", - "flax >=0.6", - "optax >=0.1", - "orbax-checkpoint >=0.2.3", - "chex >=0.1", - "etils >=1.3", - "supersuit >=3.9", - "tqdm >=4.66.1", + "jax >=0.6.2", + "chex >=0.1.89", + "distrax >= 0.1.5", + "flax >=0.10.7", + "optax >=0.2.5", + "orbax-checkpoint >=0.11.19", + "etils >=1.13.0", + "supersuit >=3.10.0", + "tqdm >=4.67.1", "pandas >=2.0.3", - "matplotlib >=3.7.4", - "morl_baselines[all]", + "matplotlib >=3.10.0", + "morl_baselines[all] >=1.1.0", "pycddlib==2.1.6", ] all = [ - # All dependencies above except accept-rom-license - # NOTE: No need to manually remove the duplicates, setuptools automatically does that - "jax >=0.4.13", - "chex >=0.1", - "distrax >=0.1.3", - "flax >=0.6", - "optax >=0.1", - "orbax-checkpoint >=0.2.3", - "chex >=0.1", - "etils >=1.3", - "supersuit >=3.9", - "tqdm >=4.66.1", - "pandas >=2.0.3", - "matplotlib >=3.7.4", - "morl_baselines[all]", - "pycddlib==2.1.6", + "momaland[learning]", ] testing = ["pytest ==7.1.3"] [project.urls] -Homepage = "https://github.com/rradules/momaland/tree/main" -Repository = "https://github.com/rradules/momaland/tree/main" -Documentation = "https://github.com/rradules/momaland/tree/main" -"Bug Report" = "https://github.com/rradules/momaland/tree/main/issues" +Homepage = "https://momaland.farama.org/" +Repository = "https://github.com/Farama-Foundation/momaland" +Documentation = "https://momaland.farama.org/" +"Bug Report" = "https://github.com/Farama-Foundation/momaland/tree/main/issues" [tool.setuptools] include-package-data = true @@ -105,7 +82,7 @@ momaland = [ [tool.black] line-length = 127 -target-version = ['py39', 'py310', 'py311', 'py312'] +target-version = ['py310', 'py311', 'py312'] include = '\.pyi?$' [tool.isort] @@ -123,7 +100,7 @@ exclude = ["**/node_modules", "**/__pycache__"] strict = [] typeCheckingMode = "basic" -pythonVersion = "3.9" +pythonVersion = "3.10" pythonPlatform = "All" typeshedPath = "typeshed" enableTypeIgnoreComments = true diff --git a/setup.py b/setup.py index f00349a..5b73095 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ def get_version(): - """Gets the mo-gymnasium version.""" + """Gets the momaland version.""" path = CWD / "momaland" / "__init__.py" content = path.read_text() for line in content.splitlines():