From 78f4a57f2876da4b5fab08537b8c0169045ecba5 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 11 Dec 2019 16:49:33 +0100 Subject: [PATCH 01/21] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ebe47839..22b557f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,6 @@ addons: # command to install dependencies install: - - pip install -r requirements.txt + - travis_wait pip install -r requirements.txt # command to run script: python devsimpy.py \ No newline at end of file From fb78b6e71fb73c385f92f0175cbb0105cf32a5e7 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 11 Dec 2019 17:19:02 +0100 Subject: [PATCH 02/21] update travis.yaml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22b557f8..3a245660 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,6 @@ addons: # command to install dependencies install: - - travis_wait pip install -r requirements.txt + - pip install wxpython PyPubSub==3.0.0 pyyaml ruamel.yaml #-r requirements.txt # command to run script: python devsimpy.py \ No newline at end of file From d9e427ab7fa1fc9933cc6adae3044e256342f348 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 11 Dec 2019 17:40:47 +0100 Subject: [PATCH 03/21] update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a245660..92bf836a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,6 @@ addons: # command to install dependencies install: - - pip install wxpython PyPubSub==3.0.0 pyyaml ruamel.yaml #-r requirements.txt + - pip install wxpython PyPubSub==3.3.0 pyyaml ruamel.yaml #-r requirements.txt # command to run script: python devsimpy.py \ No newline at end of file From a1a9bd256c86042f357af54f355afb0371eaddfa Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 09:40:52 +0100 Subject: [PATCH 04/21] update .travis.yml --- .travis.yml | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92bf836a..68b273b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,24 +10,38 @@ services: # - "sh -e /etc/init.d/xvfb start" # - sleep 3 # give xvfb some time to start +sudo: true + +cache: pip + +on_success: never +on_failure: change + git: submodules: false -addons: - apt: - packages: - # - libwebkitgtk-dev - # - libjpeg-dev - # - libtiff-dev - - libgtk-3-dev - # - libsdl1.2-dev - # - libgstreamer-plugins-base0.10-dev - # - freeglut3 - # - freeglut3-dev - # - libnotify-dev +#addons: +# apt: +# packages: +# - dpkg-dev +# - build-essential +# - python-dev +# - libjpeg-dev +# - libtiff5-dev +# - libsdl1.2-dev +# - libgstreamer-plugins-base0.10-dev +# - libnotify-dev +# - freeglut3 +# - freeglut3-dev +# - libsm-dev +# - libgtk-3-dev +# - libwebkitgtk-3.0-dev +# - libgstreamer-plugins-base1.0-dev # command to install dependencies install: - - pip install wxpython PyPubSub==3.3.0 pyyaml ruamel.yaml #-r requirements.txt + - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython + - python setup.py install + - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml #-r requirements.txt # command to run script: python devsimpy.py \ No newline at end of file From 8f8cf41a64743563ed3f8446bb8d6184e629bf51 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 09:43:26 +0100 Subject: [PATCH 05/21] update travis.yml --- .travis.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68b273b5..119d596e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,23 +20,23 @@ on_failure: change git: submodules: false -#addons: -# apt: -# packages: -# - dpkg-dev -# - build-essential -# - python-dev -# - libjpeg-dev -# - libtiff5-dev -# - libsdl1.2-dev -# - libgstreamer-plugins-base0.10-dev -# - libnotify-dev -# - freeglut3 -# - freeglut3-dev -# - libsm-dev -# - libgtk-3-dev -# - libwebkitgtk-3.0-dev -# - libgstreamer-plugins-base1.0-dev +addons: + apt: + packages: + - dpkg-dev + - build-essential + - python-dev + - libjpeg-dev + - libtiff5-dev + - libsdl1.2-dev + - libgstreamer-plugins-base0.10-dev + - libnotify-dev + - freeglut3 + - freeglut3-dev + - libsm-dev + - libgtk-3-dev + - libwebkitgtk-3.0-dev + - libgstreamer-plugins-base1.0-dev # command to install dependencies install: From 034795cab2f36ac6d701e975b97dc493653c3145 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 10:24:19 +0100 Subject: [PATCH 06/21] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 119d596e..12366c55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ addons: # command to install dependencies install: - - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython + - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython - python setup.py install - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml #-r requirements.txt # command to run From cf79b18176f5697a90cbb5f914975486a052824b Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 10:33:20 +0100 Subject: [PATCH 07/21] bug fix and add close command param --- PlotGUI.py | 2 +- devsimpy.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/PlotGUI.py b/PlotGUI.py index cd1fce0b..192e4229 100644 --- a/PlotGUI.py +++ b/PlotGUI.py @@ -445,7 +445,7 @@ def OnPlotLine(self, event=None): m = max([a[1] for a in dd]) dd = [(b[0], b[1]/m) for b in dd] - L.append(plot.PolyLine(d, legend = 'Port %d %s'%(ind,self.legend), colour = cc, width=1)) + L.append(plot.PolyLine(dd, legend = 'Port %d %s'%(ind,self.legend), colour = cc, width=1)) a,b,c,d = get_limit(dd) diff --git a/devsimpy.py b/devsimpy.py index bb56d1f3..eee2f5e8 100644 --- a/devsimpy.py +++ b/devsimpy.py @@ -1674,6 +1674,15 @@ def StartSimulationGUIWin(self, arg, diagrams): evt = wx.PyCommandEvent(wx.EVT_BUTTON.typeId, sf._btn1.GetId()) wx.PostEvent(sf._btn1, evt) + ### Force to close DEVSimPy + try: + arg = sys.argv[-1] + except IndexError: + pass + else: + if arg in ('close','quit'): + self.Close() + ##---------------------------------------------- #def AdjustTab(self, evt): ## clic sur simulation From 85e92fbe21aa7cb4ca4c90419c8f5373bbeecac9 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 10:38:32 +0100 Subject: [PATCH 08/21] update help --- devsimpy.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/devsimpy.py b/devsimpy.py index eee2f5e8..be144505 100644 --- a/devsimpy.py +++ b/devsimpy.py @@ -1674,14 +1674,15 @@ def StartSimulationGUIWin(self, arg, diagrams): evt = wx.PyCommandEvent(wx.EVT_BUTTON.typeId, sf._btn1.GetId()) wx.PostEvent(sf._btn1, evt) - ### Force to close DEVSimPy - try: - arg = sys.argv[-1] - except IndexError: - pass - else: - if arg in ('close','quit'): - self.Close() + finally: + ### Force to close DEVSimPy + try: + arg = sys.argv[-1] + except IndexError: + pass + else: + if arg in ('close','quit'): + self.Close() ##---------------------------------------------- #def AdjustTab(self, evt): @@ -2393,6 +2394,7 @@ def SetExceptionHook(self): sys.stdout.write(_('\t To load an existing dsp with a simulation frame initialized with no time limit: \n\t\t$ python devsimpy.py ntl/inf/infinity\n')) sys.stdout.write(_('\t To start simulation: \n\t\t$ python devsimpy.py ntl/inf/infinity start/go\n')) sys.stdout.write(_('\t To execute DEVSimPy cleaner: python devsimpy.py -c|-clean\n')) + sys.stdout.write(_('\t To close DEVSimPy: python devsimpy.py close|quit\n')) sys.stdout.write(_('Authors: L. Capocchi (capocchi@univ-corse.fr)\n')) sys.exit() From 86df99799173515e3ea3ead94bd9e7ca0ae4ecca Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 10:40:04 +0100 Subject: [PATCH 09/21] update .travis.yml --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 12366c55..5c8cc259 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,7 @@ addons: install: - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython - python setup.py install - - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml #-r requirements.txt + - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml + # command to run -script: python devsimpy.py \ No newline at end of file +script: python devsimpy.py examples/model0.dsp 10 start stop \ No newline at end of file From 050257b927f8d7f71fe4bca12b9be079ec9c4750 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 10:43:38 +0100 Subject: [PATCH 10/21] update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5c8cc259..210e3045 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ addons: - freeglut3-dev - libsm-dev - libgtk-3-dev + - libpng16-16 - libwebkitgtk-3.0-dev - libgstreamer-plugins-base1.0-dev From f88e2ad1d611d9cd24dedea31c2e670da07e0e07 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 10:47:48 +0100 Subject: [PATCH 11/21] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 210e3045..e891af15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ addons: # command to install dependencies install: - - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04 wxPython + - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython - python setup.py install - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml From a3b166100a011e4c099b47ed2697028dae99a6f7 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 12:03:52 +0100 Subject: [PATCH 12/21] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e891af15..0bc31d9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,4 +46,4 @@ install: - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml # command to run -script: python devsimpy.py examples/model0.dsp 10 start stop \ No newline at end of file +script: python devsimpy.py examples/model0.dsp stop \ No newline at end of file From 87d11f94a00d76fda6ee177d4c911f8a87ef2470 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 13:38:17 +0100 Subject: [PATCH 13/21] update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0bc31d9c..4ec2579c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,7 @@ addons: - libpng16-16 - libwebkitgtk-3.0-dev - libgstreamer-plugins-base1.0-dev + - at-spi2-core # command to install dependencies install: From e50cf02568831944daa494cab83e88417b44bf5d Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 14:36:30 +0100 Subject: [PATCH 14/21] add travis wait --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4ec2579c..9db0b412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,4 +47,4 @@ install: - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml # command to run -script: python devsimpy.py examples/model0.dsp stop \ No newline at end of file +script: travis_wait python devsimpy.py examples/model0.dsp stop \ No newline at end of file From d15a45395c3b5f39bd71d3c645268a2fca8302b7 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 14:37:28 +0100 Subject: [PATCH 15/21] add travis wait --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9db0b412..fc5f9b7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,9 @@ addons: # command to install dependencies install: - - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython - - python setup.py install - - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml + - travis_wait pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython + - travis_wait python setup.py install + - travis_wait pip install PyPubSub==3.3.0 pyyaml ruamel.yaml # command to run -script: travis_wait python devsimpy.py examples/model0.dsp stop \ No newline at end of file +script: python devsimpy.py examples/model0.dsp stop \ No newline at end of file From dff2176092fd7fb65dd559c82a2b3bda5c3e0575 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 15:06:55 +0100 Subject: [PATCH 16/21] update travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc5f9b7f..5fe173db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,9 @@ addons: # command to install dependencies install: - - travis_wait pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython - - travis_wait python setup.py install - - travis_wait pip install PyPubSub==3.3.0 pyyaml ruamel.yaml + - travis_wait 30 pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython + - travis_wait 30 python setup.py install + - travis_wait 30 pip install PyPubSub==3.3.0 pyyaml ruamel.yaml # command to run script: python devsimpy.py examples/model0.dsp stop \ No newline at end of file From 8fd2b88df9b8f94a210db8e76caaeac54b3a03bb Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Thu, 12 Dec 2019 17:11:03 +0100 Subject: [PATCH 17/21] update travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5fe173db..0c843946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,9 @@ addons: # command to install dependencies install: - - travis_wait 30 pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-14.04 wxPython - - travis_wait 30 python setup.py install - - travis_wait 30 pip install PyPubSub==3.3.0 pyyaml ruamel.yaml + - 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 # command to run script: python devsimpy.py examples/model0.dsp stop \ No newline at end of file From 239b3f1eda63855055a1b7c7d2ce5319883fc063 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Tue, 17 Dec 2019 10:02:45 +0100 Subject: [PATCH 18/21] update travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c843946..cadbac87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,4 +47,6 @@ install: - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml # command to run -script: python devsimpy.py examples/model0.dsp stop \ No newline at end of file +script: + - python devsimpy.py examples/model0.dsp stop + - echo 'Finished' \ No newline at end of file From 22a199702db30477e153affe00bde1dda694100d Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Tue, 17 Dec 2019 11:16:24 +0100 Subject: [PATCH 19/21] update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cadbac87..2ee0e350 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,4 +49,4 @@ install: # command to run script: - python devsimpy.py examples/model0.dsp stop - - echo 'Finished' \ No newline at end of file + - travis_terminate 0 \ No newline at end of file From 8f363f00988d5d4da18317467d73ce5f05cf751b Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Tue, 17 Dec 2019 16:50:01 +0100 Subject: [PATCH 20/21] update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ee0e350..dd2b4d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,4 @@ install: - pip install PyPubSub==3.3.0 pyyaml ruamel.yaml # command to run -script: - - python devsimpy.py examples/model0.dsp stop - - travis_terminate 0 \ No newline at end of file +script: travis_wait 20 python devsimpy.py examples/model0.dsp stop \ No newline at end of file From d8fd429c4ba558ff03d60f3b0cf88a8352db4473 Mon Sep 17 00:00:00 2001 From: Capocchi L Date: Wed, 18 Dec 2019 13:31:00 +0100 Subject: [PATCH 21/21] udpate trav.yml --- .travis.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd2b4d41..f872394d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,15 @@ language: python python: - "3.7" -services: - - xvfb +#services: +# - xvfb +env: + -DISPLAY=:99.0 + +before_install: + - sh -e /etc/init.d/xvfb start + #before_script: # - "export DISPLAY=:99.0" # - "sh -e /etc/init.d/xvfb start" @@ -12,10 +18,10 @@ services: sudo: true -cache: pip +#cache: pip -on_success: never -on_failure: change +#on_success: never +#on_failure: change git: submodules: false