From 0cf81991ab45eb2a5f851e63cca440f49866c78a Mon Sep 17 00:00:00 2001 From: AI_WAIFU Date: Thu, 20 Jul 2023 09:33:41 +0100 Subject: [PATCH 1/3] replace gymnasium with gym --- minetester/minetest_env.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/minetester/minetest_env.py b/minetester/minetest_env.py index 3ab4ab5d075e..647f6ed92b48 100644 --- a/minetester/minetest_env.py +++ b/minetester/minetest_env.py @@ -5,7 +5,7 @@ import uuid from typing import Any, Dict, List, Optional, Tuple -import gym +import gymnasium as gym import matplotlib.pyplot as plt import numpy as np import zmq diff --git a/setup.py b/setup.py index 2b15d47b2b40..8ffc4a1791d4 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ author_email='', packages=['minetester'], install_requires=[ - 'gym', + 'gymnasium', 'numpy', 'matplotlib', 'zmq', From cdbdd89a045f21c85fc41692d920978018b7c692 Mon Sep 17 00:00:00 2001 From: AI_WAIFU Date: Thu, 20 Jul 2023 18:01:56 +0100 Subject: [PATCH 2/3] add minetester specific cleanup --- Makefile | 5 ++++- util/minetester/clean_minetester.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 util/minetester/clean_minetester.sh diff --git a/Makefile b/Makefile index 57fbf7d54eb9..ea634109d554 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ minetester: $(MINETESTER_WHEEL) install: #install python library - pip install $(MINETESTER_WHEEL) + pip install $(MINETESTER_WHEEL) --force-reinstall demo: #install run demo script @@ -60,3 +60,6 @@ demo: clean: #clean up repo util/minetester/clean.sh + +clean_minetester: + util/minetester/clean_minetester.sh diff --git a/util/minetester/clean_minetester.sh b/util/minetester/clean_minetester.sh new file mode 100755 index 000000000000..5b3cef5cbe9e --- /dev/null +++ b/util/minetester/clean_minetester.sh @@ -0,0 +1 @@ +rm -r build/package From 7b6e09deb8340814c1dbb8560eecafc3cab43356 Mon Sep 17 00:00:00 2001 From: AI_WAIFU Date: Thu, 20 Jul 2023 18:17:36 +0100 Subject: [PATCH 3/3] update README --- Makefile | 1 + README.md | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Makefile b/Makefile index ea634109d554..e5237c74db77 100644 --- a/Makefile +++ b/Makefile @@ -62,4 +62,5 @@ clean: util/minetester/clean.sh clean_minetester: + #clean up minetester, but not minetest util/minetester/clean_minetester.sh diff --git a/README.md b/README.md index 52186584f6c7..14436da6413d 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,15 @@ make demo #run the demo script make clean #clean up build artifacts ``` +Additionally the makefile supports a utility to clean only the minetester install + +``` +make clean_minetester #remove existing minetester install +make minetester #build minetester python library +make install #install python library into local environment along with nessesary dependencies +make demo #run the demo script +``` + Minetest ========