From 006300242c072a808c43e2482133d8a3f9e15226 Mon Sep 17 00:00:00 2001
From: "Egli Adrian (IT-SCI-API-PFI)" <adrian.egli@sbb.ch>
Date: Mon, 8 Jul 2019 15:38:19 +0200
Subject: [PATCH] #78 Windows test fixes
---
getting_started/getting_started.bat | 7 +++----
notebooks/Scene_Editor.ipynb | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/getting_started/getting_started.bat b/getting_started/getting_started.bat
index 03dfcc4..451a2fc 100644
--- a/getting_started/getting_started.bat
+++ b/getting_started/getting_started.bat
@@ -8,16 +8,15 @@ echo "************ TESTING PREREQUISITES PYTHON3 + GIT + GIT *******************
git --version || goto :error
python --version || goto :error
-rem deactivae in case we're in virtualenv
-call deactivate
-conda --version || goto :error
+rem deactivate in case we're in virtualenv
+call conda deactivate || call deactivate
@echo off
echo "************ SETUP VIRTUAL ENVIRONMENT FLATLAND *************************"
@echo on
(conda info --envs | findstr flatland-rl) || conda create python=3.6 -y --name flatland-rl || goto :error
-call activate flatland-rl || goto :error
+(call conda activate flatland-rl || call activate flatland-rl) || goto :error
@echo off
diff --git a/notebooks/Scene_Editor.ipynb b/notebooks/Scene_Editor.ipynb
index 64bbad7..87b2d38 100644
--- a/notebooks/Scene_Editor.ipynb
+++ b/notebooks/Scene_Editor.ipynb
@@ -70,7 +70,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "0b92e7084e37450cbfb3855dc3a58543",
+ "model_id": "86a323f55bb54ff78169a9c7ca63730f",
"version_major": 2,
"version_minor": 0
},
@@ -111,7 +111,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.6.5"
+ "version": "3.6.8"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
--
GitLab