From 1c019dbb2eea57120aa393b11af4916557300403 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 25 Mar 2020 18:00:13 +0100 Subject: [PATCH 1/4] Avoid dependancy of the version of PyPubSub package --- README.md | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 830c49c2..12c70a6a 100644 --- a/README.md +++ b/README.md @@ -36,12 +36,12 @@ With DEVSimPy you can: To get DEVSimPy V4.0 package with all Git submodule: ```sh -$ git clone --recurse-submodules -b version-4.0 --depth=1 https://github.com/capocchi/DEVSimPy.git . +$ git clone --recurse-submodules -b version-4.0 --depth=1 https://github.com/capocchi/DEVSimPy.git $ git fetch --unshallow ``` -DEVSimPy depends on PyPubSub version 3.3.0 (or 3.3.1), pyyaml, ruamel.yaml and modules. -All dependencies can be installed using requirements.txt file: +DEVSimPy depends on PyPubSub, pyyaml, ruamel.yaml and other packages included in the requirements.txt file. +All dependencies can be installed using pip with the requirements.txt file: ```sh $ pip install -r requirements.txt ``` diff --git a/requirements.txt b/requirements.txt index 72576180..ccc4c218 100644 --- a/requirements.txt +++ b/requirements.txt @@ -59,7 +59,7 @@ wxPython >= 4.0.6 # SimulationGUI.py: 35 # SpreadSheet.py: 34 # devsimpy.py: 104 -PyPubSub == 3.3.0 +PyPubSub >= 3.3.0 # Mixins\Savable.py: 39 PyYAML >= 5.1.2 From a58f7c3a20dee56c38430464ba81a557e4d05a94 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 25 Mar 2020 18:24:33 +0100 Subject: [PATCH 2/4] bug fix --- plugins/blink.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/blink.py b/plugins/blink.py index 9c64f4a8..aa363342 100644 --- a/plugins/blink.py +++ b/plugins/blink.py @@ -319,5 +319,6 @@ def OnClose(self, evt): """ """ self.flag = True + self.Show(False) #self.Destroy() evt.Skip() \ No newline at end of file From da8fce6587c7b7488241b54c723e2ea58f7188dc Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 25 Mar 2020 18:28:39 +0100 Subject: [PATCH 3/4] update for PyPubSub --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad87aa25..2f49c849 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ addons: install: - travis_wait 50 pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython - travis_wait 50 python setup.py install - - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml + - pip install PyPubSub pyyaml ruamel.yaml # command to run script: travis_wait 20 python devsimpy.py examples/model0.dsp 10 start quit \ No newline at end of file From ccc71c4f0bab2472b0f41baf336384e0f90b5d2d Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 25 Mar 2020 19:51:41 +0100 Subject: [PATCH 4/4] update --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 12c70a6a..39be84c0 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,8 @@ $ pip install -r requirements.txt ``` For os X users, python.app is required in order to use pythonw instead of python to execute the devismpy.py file. -DEVSimPy don't require installation and works on all platforms (). To execute DEVSimPy: +# Usage +To execute DEVSimPy: ```sh $ python devsimpy.py ```