From e6e22f51a850c48807f15f7b2abf66bd155aeedc Mon Sep 17 00:00:00 2001 From: guillemdb Date: Sun, 1 Sep 2024 11:42:57 +0200 Subject: [PATCH 1/3] Remove unused make commands Signed-off-by: guillemdb --- Makefile | 59 +----------------- ...mpressed ROMs.zip => uncompressed_ROMs.zip | Bin 2 files changed, 1 insertion(+), 58 deletions(-) rename uncompressed ROMs.zip => uncompressed_ROMs.zip (100%) diff --git a/Makefile b/Makefile index 312dd9c..e77ee51 100644 --- a/Makefile +++ b/Makefile @@ -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} @@ -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 diff --git a/uncompressed ROMs.zip b/uncompressed_ROMs.zip similarity index 100% rename from uncompressed ROMs.zip rename to uncompressed_ROMs.zip From 1104d54dcd94d3b75e8caeb38988b43248839f26 Mon Sep 17 00:00:00 2001 From: guillemdb Date: Sun, 1 Sep 2024 11:51:02 +0200 Subject: [PATCH 2/3] Disable running build Signed-off-by: guillemdb --- .github/workflows/push.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index ba2d200..8d16fa4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -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 From 665d4536c165343ba4e72f02218cd922e03ba345 Mon Sep 17 00:00:00 2001 From: guillemdb Date: Sun, 1 Sep 2024 11:57:23 +0200 Subject: [PATCH 3/3] Update codecov.yaml, README.md Signed-off-by: guillemdb --- .codecov.yml | 1 - README.md | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.codecov.yml b/.codecov.yml index b69942a..23def1e 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -3,7 +3,6 @@ ignore: - tests coverage: status: - patch: off project: default: target: auto diff --git a/README.md b/README.md index 3f20744..f9c0f7a 100644 --- a/README.md +++ b/README.md @@ -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