Skip to content

Commit

Permalink
Merge pull request #48 from fedebotu/main
Browse files Browse the repository at this point in the history
Add CI tests, move to `pyproject.toml`
  • Loading branch information
amacrutherford authored Dec 3, 2023
2 parents fef33aa + 9e44ad9 commit 2d2c014
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 60 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Tests
on: [push, pull_request]

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
max-parallel: 15
matrix:
# os: [ubuntu-latest, macos-latest, windows-latest, macos-13-xlarge]
# For Apple Silicon: https://github.com/actions/runner-images/issues/8439
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
# Exclude Python 3.8 on Windows because of resolution issues
exclude:
- os: windows-latest
python-version: '3.8'
defaults:
run:
shell: bash
steps:
- name: Check out repository
uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest
pip install -e '.[dev]'
- name: Run pytest
run: pytest tests
3 changes: 2 additions & 1 deletion jaxmarl/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from .registration import make, registered_envs

__all__ = ["make", "registered_envs"]
__all__ = ["make", "registered_envs"]
__version__ = "0.0.2"
1 change: 0 additions & 1 deletion jaxmarl/_version.py

This file was deleted.

41 changes: 41 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[build-system]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools.packages.find]
include = ['jaxmarl*']

[tool.setuptools.dynamic]
version = {attr = "jaxmarl.__version__"}
dependencies = {file = ["requirements/requirements.txt"]}
optional-dependencies = {dev = { file = ["requirements/requirements-dev.txt"] }, qlearning = { file = ["requirements-qlearning.txt"] }}

[project]
name = "jaxmarl"
readme = "README.md"
description = "Multi-Agent Reinforcement Learning with JAX"
authors = [
{name = "Foerster Lab for AI Research", email = "arutherford@robots.ox.ac.uk"},
]
dynamic = ["version", "dependencies", "optional-dependencies"]
license = {file = "LICENSE"}
requires-python = ">=3.8"
classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Operating System :: OS Independent",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
"Topic :: Software Development :: Libraries :: Python Modules",
"License :: OSI Approved :: Apache Software License",
]

[project.urls]
"Homepage" = "https://github.com/FLAIROx/JaxMARL"
"Bug Tracker" = "https://github.com/FLAIROx/JaxMARL/issues"
1 change: 1 addition & 0 deletions requirements/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pytest
pygame
pettingzoo>=1.23.1
tqdm>=4.65.0
58 changes: 0 additions & 58 deletions setup.py

This file was deleted.

0 comments on commit 2d2c014

Please sign in to comment.