Skip to content

Commit

Permalink
Merge pull request #115 from FragileTech/makefile
Browse files Browse the repository at this point in the history
Remove unused make commands
  • Loading branch information
Guillemdb authored Sep 1, 2024
2 parents 29c66b1 + 665d453 commit c46682a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 69 deletions.
1 change: 0 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ignore:
- tests
coverage:
status:
patch: off
project:
default:
target: auto
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,16 @@ jobs:
rye lock --all-features
uv pip install -r requirements.lock
uv pip install dist/*.whl
ROM_PASSWORD=${{ secrets.ROM_PASSWORD }} python -m plangym.scripts.import_retro_roms
# ROM_PASSWORD=${{ secrets.ROM_PASSWORD }} python -m plangym.scripts.import_retro_roms

- name: Test package
env:
UV_SYSTEM_PYTHON: 1
run: |
set -x
rm -rf $PROJECT_DIR
find . -name "*.pyc" -delete
make test
# - name: Test package
# env:
# UV_SYSTEM_PYTHON: 1
# run: |
# set -x
# rm -rf $PROJECT_DIR
# find . -name "*.pyc" -delete
# make test

bump-version:
name: Bump package version
Expand Down
59 changes: 1 addition & 58 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,11 @@ PROJECT = plangym
n ?= auto
DOCKER_ORG = fragiletech
DOCKER_TAG ?= ${PROJECT}
ROM_FILE ?= "uncompressed ROMs.zip"
ROM_FILE ?= "uncompressed_ROMs.zip"
ROM_PASSWORD ?= "NO_PASSWORD"
VERSION ?= latest
MUJOCO_PATH?=~/.mujoco

.POSIX:
style:
black .
isort .

.POSIX:
check:
!(grep -R /tmp tests)
flakehell lint ${PROJECT}
pylint ${PROJECT}
black --check ${PROJECT}

.PHONY: install-mujoco
install-mujoco:
mkdir ${MUJOCO_PATH}
Expand All @@ -42,51 +30,6 @@ install-envs:
make -f Makefile.docker install-env-deps
make install-mujoco

.PHONY: test-parallel
test-parallel:
find . -name "*.pyc" -delete
DISABLE_RAY=True pytest --doctest-modules -n $n -s -o log_cli=true -o log_cli_level=info

.PHONY: test-ray
test-ray:
find . -name "*.pyc" -delete
pytest tests/vectorization/test_ray.py -n 1 -s -o log_cli=true -o log_cli_level=info

.PHONY: doctest
doctest:
DISABLE_RAY=True xvfb-run -s "-screen 0 1400x900x24" pytest plangym --doctest-modules -n $n -s -o log_cli=true -o log_cli_level=info

.PHONY: test
test:
find . -name "*.pyc" -delete
PYVIRTUALDISPLAY_DISPLAYFD=0 SKIP_CLASSIC_CONTROL=1 xvfb-run -s "-screen 0 1400x900x24" pytest -n auto -s -o log_cli=true -o log_cli_level=info tests
PYVIRTUALDISPLAY_DISPLAYFD=0 xvfb-run -s "-screen 0 1400x900x24" pytest -s -o log_cli=true -o log_cli_level=info tests/control/test_classic_control.py

.PHONY: run-codecov-test
run-codecov-test:
find . -name "*.pyc" -delete
DISABLE_RAY=True pytest --doctest-modules -n $n -s -o log_cli=true -o log_cli_level=info --cov=./ --cov-report=xml --cov-config=pyproject.toml
pytest tests/vectorization/test_ray.py -n 1 -s -o log_cli=true -o log_cli_level=info --cov-append --cov=./ --cov-report=xml --cov-config=pyproject.toml

.PHONY: test-codecov
test-codecov:
xvfb-run -s "-screen 0 1400x900x24" make run-codecov-test

.PHONY: pipenv-install
pipenv-install:
rm -rf *.egg-info && rm -rf build && rm -rf __pycache__
rm -f Pipfile && rm -f Pipfile.lock
pipenv install --dev -r requirements-test.txt
pipenv install --pre --dev -r requirements-lint.txt
pipenv install -r requirements.txt
pipenv install -e .
pipenv lock

.PHONY: pipenv-test
pipenv-test:
find -name "*.pyc" -delete
pipenv run pytest -s

.PHONY: docker-shell
docker-shell:
docker run --rm --gpus all -v ${current_dir}:/${PROJECT} --network host -w /${PROJECT} -it ${DOCKER_ORG}/${PROJECT}:${VERSION} bash
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ an [issue](https://github.com/FragileTech/plangym/issues).
#### Step 1: Install necessary development tools and libraries
sudo apt-get update
sudo apt-get install build-essential clang
sudo apt-get install libstdc++-10-dev

#### Step 2: Verify the compiler and include paths
#### Ensure you are using g++ instead of clang++ if clang++ is not properly configured
Expand Down
File renamed without changes.

0 comments on commit c46682a

Please sign in to comment.