Addresses #30 - Consistently use requirements_dev for specifying the dependencies of the package

.gitignore

@@ -109,3 +109,4 @@ ENV/
 
 
 images/test/
+test_save.dat

MANIFEST.in

@@ -3,6 +3,7 @@ include CONTRIBUTING.rst
 include HISTORY.rst
 include LICENSE
 include README.rst
+include requirements_dev.txt
 
 recursive-include tests *
 recursive-exclude * __pycache__

flatland/envs/observations.py

@@ -219,8 +219,8 @@ class TreeObsForRailEnv(ObservationBuilder):
             if possible_transitions[branch_direction]:
                 new_cell = self._new_position(agent.position, branch_direction)
 
-                branch_observation, branch_visited = self._explore_branch(handle, new_cell, branch_direction, root_observation,
-                                                                   1)
+                branch_observation, branch_visited = \
+                    self._explore_branch(handle, new_cell, branch_direction, root_observation, 1)
                 observation = observation + branch_observation
                 visited = visited.union(branch_visited)
             else:

setup.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """The setup script."""
-
+import os
 from setuptools import setup, find_packages
 
 with open('README.rst') as readme_file:
@@ -11,11 +11,19 @@ with open('README.rst') as readme_file:
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
-requirements = ['Click>=6.0', ]
-
-setup_requirements = ['pytest-runner', ]
-
-test_requirements = ['pytest', ]
+# Gather requirements from requirements_dev.txt
+# TODO : We could potentially split up the test/dev dependencies later
+install_reqs = []
+requirements_path = 'requirements_dev.txt'
+with open(requirements_path, 'r') as f:
+    install_reqs += [
+        s for s in [
+            line.strip(' \n') for line in f
+        ] if not s.startswith('#') and s != ''
+    ]
+requirements = install_reqs
+setup_requirements = install_reqs
+test_requirements = install_reqs
 
 setup(
     author="S.P. Mohanty",

tox.ini

@@ -23,7 +23,10 @@ commands = make docs
 [testenv:coverage]
 basepython = python
 whitelist_externals = make
-commands = make coverage
+commands = 
+    pip install -U pip
+    pip install -r requirements_dev.txt
+    make coverage
 
 [testenv]
 setenv =
@@ -35,6 +38,7 @@ deps =
 ;     -r{toxinidir}/requirements.txt
 commands =
     pip install -U pip
+    pip install -r requirements_dev.txt
     py.test --basetemp={envtmpdir}