diff --git a/README.md b/README.md index d5b0ddd..7f7e065 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,10 @@ Once you have downloaded CoppeliaSim, add the following to your *~/.bashrc* / *~ ```bash export COPPELIASIM_ROOT=EDIT/ME/PATH/TO/COPPELIASIM/INSTALL/DIR ``` +Note for mac, this is usually: +```bash +export COPPELIASIM_ROOT=/Applications/coppeliaSim.app/Contents/MacOS +``` Install PyRep: diff --git a/pyrep/backend/lib.py b/pyrep/backend/lib.py index 51352b7..fcf8547 100644 --- a/pyrep/backend/lib.py +++ b/pyrep/backend/lib.py @@ -24,13 +24,12 @@ coppeliasim_library = "" plat = platform.system() if plat == "Windows": - raise NotImplementedError() + raise NotImplementedError("Windows not tested yet.") # coppeliasim_library /= f'{defaultLibNameBase}.dll' elif plat == "Linux": coppeliasim_library = os.path.join(coppeliasim_root, "libcoppeliaSim.so") elif plat == "Darwin": - raise NotImplementedError() - # coppeliasim_library /= f'../MacOS/lib{defaultLibNameBase}.dylib' + coppeliasim_library = os.path.join(coppeliasim_root, "libcoppeliaSim.dylib") if not os.path.isfile(coppeliasim_library): raise PyRepError( "COPPELIASIM_ROOT was not a correct path. " "See installation instructions" diff --git a/setup.py b/setup.py index 9024479..93b6d50 100644 --- a/setup.py +++ b/setup.py @@ -18,21 +18,6 @@ def get_version(rel_path): raise RuntimeError("Unable to find version string.") -# Temp fix for CoppeliaSim 4.1 -if "COPPELIASIM_ROOT" not in os.environ: - raise RuntimeError("COPPELIASIM_ROOT not defined.") - -usrset_file = os.path.join(os.environ["COPPELIASIM_ROOT"], "system", "usrset.txt") -usrset = "" -if os.path.isfile(usrset_file): - with open(usrset_file, "r") as f: - usrset = f.read() - -if "allowOldEduRelease" not in usrset: - with open(usrset_file, "a+") as f: - f.write("\nallowOldEduRelease=7501\n") - - core_requirements = [ "numpy", "cbor",