Skip to content

Commit 739950a

Browse files
authored
Merge pull request #158 from joshcarp/foobar
WIP migrate to uv package manager, fixing package compatibility issues
2 parents 8bbf72e + f27d74d commit 739950a

File tree

18 files changed

+2089
-1324
lines changed

18 files changed

+2089
-1324
lines changed

.github/workflows/blackisort.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/pythonlint.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/pythontests.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
11
on: ['push', 'pull_request']
22
jobs:
3-
# Removed macos tests because github actions doesn't support python 3.7 anymore
4-
# osx_mdp_tests:
5-
# runs-on: macos-latest
6-
# steps:
7-
# - uses: actions/checkout@v3
8-
# - name: Set up Python 3.7
9-
# uses: actions/setup-python@v4
10-
# with:
11-
# python-version: '3.7'
12-
# architecture: 'x64'
13-
# - name: Install dependencies
14-
# run: python -m pip install --upgrade pip
15-
# - name: Setup
16-
# run: pip install -e .[harl]
17-
# - name: Run tests
18-
# run: |
19-
# python -m unittest discover -s testing/ -p "*_test.py"
203
ubuntu_mdp_tests:
214
runs-on: ubuntu-latest
225
steps:
236
- uses: actions/checkout@v3
24-
- name: Set up Python 3.8
7+
- name: Set up Python 3.10.16
258
uses: actions/setup-python@v4
269
with:
27-
python-version: 3.8
10+
python-version: 3.10.16
2811
architecture: 'x64'
29-
- name: Install dependencies
12+
- name: Install uv
3013
run: |
31-
python -m pip install --upgrade pip
32-
pip install coverage
14+
curl -LsSf https://astral.sh/uv/install.sh | sh
15+
- name: Setup virtual environment and install dependencies
16+
run: |
17+
uv venv
18+
source .venv/bin/activate
19+
uv pip install coverage
3320
- name: Setup # needs -e flag for coverage tests to work
34-
run: pip install -e .[harl]
21+
run: |
22+
source .venv/bin/activate
23+
uv pip install -e .
3524
- name: Run tests and generate coverage report
3625
run: |
26+
source .venv/bin/activate
3727
coverage run -m unittest discover -s testing/ -p "*_test.py"
3828
- name: Upload coverage to Codecov
3929
uses: codecov/codecov-action@v1

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,7 @@ node_modules/
172172
**/__pycache__/
173173
#manually correcting for demo
174174
!**/static/**/*.png
175-
!src/overcooked_demo/server/static/lib
175+
!src/overcooked_demo/server/static/lib
176+
177+
# Ignore copied overcooked_ai directory in server
178+
src/overcooked_demo/server/overcooked_ai/

0 commit comments

Comments
 (0)