From 7160aec7f7dc82b910f5836e0d4c57445bbbde50 Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Thu, 11 Jul 2019 16:52:27 +0200
Subject: [PATCH] #97 tox-conda #94 use miniconda instead of anaconda
---
.gitignore | 2 --
{tests => flatland/utils}/simple_rail.py | 0
requirements_dev.txt | 1 +
setup.py | 12 +++++++++++-
tests/__init__.py | 0
tests/test_flatland_envs_observations.py | 2 +-
tests/test_flatland_envs_predictions.py | 2 +-
tox.ini | 4 +---
8 files changed, 15 insertions(+), 8 deletions(-)
rename {tests => flatland/utils}/simple_rail.py (100%)
delete mode 100644 tests/__init__.py
diff --git a/.gitignore b/.gitignore
index 0bd7dd9d..82c633d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,8 +71,6 @@ target/
# Jupyter Notebook
.ipynb_checkpoints
-# Jupyter Notebooks converted to python
-notebooks/*.py
# PyCharm
.idea/
diff --git a/tests/simple_rail.py b/flatland/utils/simple_rail.py
similarity index 100%
rename from tests/simple_rail.py
rename to flatland/utils/simple_rail.py
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 25a1ff17..957d78db 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -17,3 +17,4 @@ importlib-metadata>=0.17
importlib-resources>=1.0.1
six>=1.12.0
attrs
+ushlex
diff --git a/setup.py b/setup.py
index 0afa7bf1..937d45e4 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,14 @@ def get_all_images_files(directory='./images/'):
return ret
+def get_all_notebook_files(directory='./notebooks/'):
+ ret = []
+ for f in os.listdir(directory):
+ if os.path.isfile(os.path.join(directory, f)):
+ ret.append(directory + f)
+ return ret
+
+
# Gather requirements from requirements_dev.txt
install_reqs = []
requirements_path = 'requirements_dev.txt'
@@ -63,7 +71,9 @@ setup(
keywords='flatland',
name='flatland-rl',
packages=find_packages('.'),
- data_files=[('svg', get_all_svg_files()), ('images', get_all_images_files())],
+ data_files=[('svg', get_all_svg_files()),
+ ('images', get_all_images_files()),
+ ('notebooks', get_all_notebook_files())],
setup_requires=setup_requirements,
test_suite='tests',
tests_require=test_requirements,
diff --git a/tests/__init__.py b/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/test_flatland_envs_observations.py b/tests/test_flatland_envs_observations.py
index d400dc22..92ee4539 100644
--- a/tests/test_flatland_envs_observations.py
+++ b/tests/test_flatland_envs_observations.py
@@ -10,7 +10,7 @@ from flatland.envs.observations import GlobalObsForRailEnv, TreeObsForRailEnv
from flatland.envs.predictions import ShortestPathPredictorForRailEnv
from flatland.envs.rail_env import RailEnv, RailEnvActions
from flatland.utils.rendertools import RenderTool
-from tests.simple_rail import make_simple_rail
+from flatland.utils.simple_rail import make_simple_rail
"""Tests for `flatland` package."""
diff --git a/tests/test_flatland_envs_predictions.py b/tests/test_flatland_envs_predictions.py
index c90f91a0..7eaa502d 100644
--- a/tests/test_flatland_envs_predictions.py
+++ b/tests/test_flatland_envs_predictions.py
@@ -10,7 +10,7 @@ from flatland.envs.observations import TreeObsForRailEnv
from flatland.envs.predictions import DummyPredictorForRailEnv, ShortestPathPredictorForRailEnv
from flatland.envs.rail_env import RailEnv
from flatland.utils.rendertools import RenderTool
-from tests.simple_rail import make_simple_rail
+from flatland.utils.simple_rail import make_simple_rail
"""Test predictions for `flatland` package."""
diff --git a/tox.ini b/tox.ini
index 193f052b..30062d24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -154,9 +154,7 @@ commands =
jupyter nbextension enable --py --sys-prefix widgetsnbextension
jupyter nbextension install --py --sys-prefix jpy_canvas
jupyter nbextension enable --py --sys-prefix jpy_canvas
-; https://stackoverflow.com/questions/35545402/how-to-run-an-ipynb-jupyter-notebook-from-terminal/35545463
- sh -c 'ls {toxinidir}/notebooks/*.ipynb | xargs -n 1 jupyter nbconvert --to python'
- sh -c 'ls {toxinidir}/notebooks/*.py | xargs -I{} -n 1 sh -c "echo -e \"\n====== Running {} ========\n\"; ipython {}"'
+ python notebooks/run_all_notebooks.py
[testenv:start_jupyter]
basepython = python
--
GitLab