Merge pull request #49 from HumanCompatibleAI/planner_dev

Planner Update (Compatible with the new MDP) + Variable MDP Generator + Multi-Layout-Training Structure

Author: nathan-miller23

.github/workflows/pythontests.yml

@@ -7,40 +7,24 @@ jobs:
     - name: Set up Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: '3.7' 
+        python-version: '3.7'
         architecture: 'x64'
     - name: Install dependencies
       run: python -m pip install --upgrade pip
     - name: Setup
       run: pip install .
     - name: Run tests
       run: |
-        python testing/overcooked_test.py 
-  ## This should be uncommented once the planners are updated ##
-  # osx_full_tests:
-  #   runs-on: macos-latest
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Set up Python 3.7
-  #     uses: actions/setup-python@v2
-  #     with:
-  #       python-version: '3.7' 
-  #       architecture: 'x64'
-  #   - name: Install dependencies
-  #     run: python -m pip install --upgrade pip
-  #   - name: Setup
-  #     run: pip install .
-  #   - name: Run tests
-  #     run: |
-  #       python -m unittest discover -s testing/ -p "*_test.py"
+        python -m unittest discover -s testing/ -p "*_test.py"
+
   ubuntu_mdp_tests:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.7
       uses: actions/setup-python@v2
       with:
-        python-version: '3.7' 
+        python-version: '3.7'
         architecture: 'x64'
     - name: Install dependencies
       run: |
@@ -50,28 +34,11 @@ jobs:
       run: pip install -e .
     - name: Run tests and generate coverage report
       run: |
-        coverage run testing/overcooked_test.py
+        coverage run -m unittest discover -s testing/ -p "*_test.py"
         coverage report
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
       with:
         flags: no-planners
         name: codecov-report
         fail_ci_if_error: false
-  ## This should be uncommented once the planners are updated
-  # ubuntu_full_tests:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Set up Python 3.7
-  #     uses: actions/setup-python@v2
-  #     with:
-  #       python-version: '3.7' 
-  #       architecture: 'x64'
-  #   - name: Install dependencies
-  #     run: python -m pip install --upgrade pip
-  #   - name: Setup
-  #     run: pip install .
-  #   - name: Run tests
-  #     run: |
-  #       python -m unittest discover -s testing/ -p "*_test.py"