From 18d68e078f83ae9b89ce4489b241aef914c2da6f Mon Sep 17 00:00:00 2001
From: Capocchi L <capocchi@univ-corse.fr>
Date: Thu, 7 Jan 2021 17:11:34 +0100
Subject: [PATCH 1/2] bug fixe

---
 Container.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Container.py b/Container.py
index 616ee34a..635dad52 100644
--- a/Container.py
+++ b/Container.py
@@ -3952,6 +3952,7 @@ def __setstate__(self, state):
 
 					### try to find it in exportedPathList (after Domain check)
 					if not os.path.exists(path):
+						import wx
 						mainW = wx.GetApp().GetTopWindow()
 						for p in mainW.exportPathsList:
 							lib_name = os.path.basename(p)

From 8feadc92c9da9e129028d7c3d9f46740a253c9ca Mon Sep 17 00:00:00 2001
From: Capocchi L <capocchi@univ-corse.fr>
Date: Tue, 19 Jan 2021 19:55:21 +0100
Subject: [PATCH 2/2] update

---
 Components.py      | 2 +-
 README.md          | 7 ++++---
 SimulationGUI.py   | 3 ++-
 SimulationNoGUI.py | 3 ++-
 XMLModule.py       | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Components.py b/Components.py
index 6997e3ab..7fd2109a 100644
--- a/Components.py
+++ b/Components.py
@@ -44,12 +44,12 @@
 	import wx
 	from pubsub import pub as Publisher
 	import Editor
+	from SimpleFrameEditor import FrameEditor
 
 import ZipManager
 
 from Utilities import replaceAll, GetActiveWindow, printOnStatusBar
 from NetManager import Net
-from SimpleFrameEditor import FrameEditor
 from which import which
 
 ###########################################################
diff --git a/README.md b/README.md
index eefe6a6b..7082ab87 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,10 @@ The use of DEVSimPy requires:
 
 Users which don't want to install python with all dependencies can use [Portable Python](http://portablepython.com) (version 2.x). Then, just extract DEVSimPy archive and edit the devsimpy.py file with [PyScripter](https://sourceforge.net/projects/pyscripter/) to execute it. Users can also execute DEVSimPy through the conda env file loaded using the [conda_devsimpy_env.yml](https://github.com/capocchi/DEVSimPy-site/raw/gh-pages/conda_devsimpy_env.yml) file (available from the [DEVSimPy-site](https://github.com/capocchi/DEVSimPy-site) repository).
 
+An XUbuntu 19.10 virtual machine including DEVSimPy can be donwloaded from [DEVSimPy-on-XUbuntu19.10.ova](https://mycore.core-cloud.net/index.php/s/o8T8mAzmuuHDokh). The login and password of the distribution (root) are: devsimpy-user/devsimpy. If you want to have the latest version of DEVSimPy, please execute 'git pull' in the DEVSimPy directory before starting or start DEVSimPy by double clicking on the desktop icon and go to Help->Update->From Git Repository (pull).
+
+An archive of a conda environment which includes all the binaries of the packages needed for the DEVSimPy environment is available here: [py38.tar.gz](https://mycore.core-cloud.net/index.php/s/5nNgyvwps6O2kUy). This is useful when you want to reproduce a compatible environment for DEVSimPy and avoid all installation and dependencies requirement. 
+
 # Features
 With DEVSimPy you can:
 
@@ -47,9 +51,6 @@ All dependencies can be installed using pip with the requirements.txt file:
 ```sh
 $ pip install -r requirements.txt
 ```
-
-An XUbuntu 19.10 virtual machine including DEVSimPy can be donwloaded from [DEVSimPy-on-XUbuntu19.10.ova](https://mycore.core-cloud.net/index.php/s/o8T8mAzmuuHDokh). The login and password of the distribution (root) are: devsimpy-user/devsimpy. If you want to have the latest version of DEVSimPy, please execute 'git pull' in the DEVSimPy directory before starting or start DEVSimPy by double clicking on the desktop icon and go to Help->Update->From Git Repository (pull).
-
 # Usage
 To execute DEVSimPy:
 ```sh
diff --git a/SimulationGUI.py b/SimulationGUI.py
index c8d8ad05..fab521e9 100644
--- a/SimulationGUI.py
+++ b/SimulationGUI.py
@@ -48,7 +48,8 @@
 
 import Container
 
-_ = wx.GetTranslation
+import gettext
+_ = gettext.gettext
 
 import time
 
diff --git a/SimulationNoGUI.py b/SimulationNoGUI.py
index 3d395fe7..fe413edf 100644
--- a/SimulationNoGUI.py
+++ b/SimulationNoGUI.py
@@ -228,7 +228,8 @@ def Run(self):
         ################################################################################################################
         ################################################################################################################
         if self.master:
-            from SimulationGUI import simulator_factory
+            #from SimulationGUI import simulator_factory
+            from Patterns.Factory import simulator_factory
             if not self.ntl:
                 self.master.FINAL_TIME = float(self.time)
             
diff --git a/XMLModule.py b/XMLModule.py
index 2041872f..ae946693 100644
--- a/XMLModule.py
+++ b/XMLModule.py
@@ -16,7 +16,7 @@
 import re
 import copy
 import tempfile
-import wx
+# import wx
 
 import gettext
 _ = gettext.gettext