diff --git a/README.md b/README.md index a6545fa..3947c27 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ To use MinAtar, you need python3 installed, make sure pip is also up to date. T ```bash git clone https://github.com/kenjyoung/MinAtar.git ``` -If you prefer running MinAtar in a virtualenv, you can do the following before steps 2 and 3: +If you prefer running MinAtar in a virtualenv, you can do the following before step 2: ```bash python3 -m venv venv source venv/bin/activate @@ -26,17 +26,16 @@ source venv/bin/activate pip install --upgrade pip ``` -2. Install all dependencies and requirements: +2. Install MinAtar: ```bash -pip install -r requirements.txt +pip install . ``` - -3. Install MinAtar: +If you have any issues with automatic dependency installation, you can instead install the nessesary dependencies manually and run ```bash -python setup.py install +pip install . --no-deps ``` -To verify whether if the installation is successful, run +To verify the installation is successful, run ```bash python examples/random_play.py -g breakout ``` diff --git a/minatar_environment/__init__.py b/minatar/__init__.py similarity index 100% rename from minatar_environment/__init__.py rename to minatar/__init__.py diff --git a/minatar_environment/environment.py b/minatar/environment.py similarity index 100% rename from minatar_environment/environment.py rename to minatar/environment.py diff --git a/environments/__init__.py b/minatar/environments/__init__.py similarity index 100% rename from environments/__init__.py rename to minatar/environments/__init__.py diff --git a/environments/asterix.py b/minatar/environments/asterix.py similarity index 100% rename from environments/asterix.py rename to minatar/environments/asterix.py diff --git a/environments/breakout.py b/minatar/environments/breakout.py similarity index 100% rename from environments/breakout.py rename to minatar/environments/breakout.py diff --git a/environments/freeway.py b/minatar/environments/freeway.py similarity index 100% rename from environments/freeway.py rename to minatar/environments/freeway.py diff --git a/environments/seaquest.py b/minatar/environments/seaquest.py similarity index 100% rename from environments/seaquest.py rename to minatar/environments/seaquest.py diff --git a/environments/space_invaders.py b/minatar/environments/space_invaders.py similarity index 100% rename from environments/space_invaders.py rename to minatar/environments/space_invaders.py diff --git a/minatar_environment/gui.py b/minatar/gui.py similarity index 100% rename from minatar_environment/gui.py rename to minatar/gui.py diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 4bb64bc..0000000 --- a/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -cycler==0.10.0 -kiwisolver==1.0.1 -matplotlib==3.0.3 -numpy==1.16.2 -pandas==0.24.2 -pyparsing==2.3.1 -python-dateutil==2.8.0 -pytz==2018.9 -scipy==1.2.1 -seaborn==0.9.0 -six==1.12.0 -torch==1.0.1.post2 diff --git a/setup.py b/setup.py index 4bfe880..aa6fc9b 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,25 @@ -from distutils.core import setup +from setuptools import setup -setup(name='MinAtar', - version='1.0.2', - description='A miniaturized version of the arcade learning environment.', - url='https://github.com/kenjyoung/MinAtar', - author='Kenny Young', - author_email='kjyoung@ualberta.com', - license='GPL', - packages=['minatar', 'minatar.environments'], - package_dir={'minatar': 'minatar_environment', 'minatar.environments':'environments'}) \ No newline at end of file +setup( + name='MinAtar', + version='1.0.3', + description='A miniaturized version of the arcade learning environment.', + url='https://github.com/kenjyoung/MinAtar', + author='Kenny Young', + author_email='kjyoung@ualberta.com', + license='GPL', + packages=['minatar', 'minatar.environments'], + install_requires=[ + 'cycler>=0.10.0', + 'kiwisolver>=1.0.1', + 'matplotlib>=3.0.3', + 'numpy>=1.16.2', + 'pandas>=0.24.2', + 'pyparsing>=2.3.1', + 'python-dateutil>=2.8.0', + 'pytz>=2018.9', + 'scipy>=1.2.1', + 'seaborn>=0.9.0', + 'six>=1.12.0', + 'torch>=1.0.0', + ])