Skip to content

Commit 486e774

Browse files
author
Luiko Czub
committed
support Ride 1.5 and RF 2.9.2 #4 
1 parent f8865ca commit 486e774

File tree

6 files changed

+59
-54
lines changed

6 files changed

+59
-54
lines changed

‎Robot/descriptions.nsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
; Don't use any version numbers here as it is shared between versions.
2828

2929
LangString DESC_PYTHON_CORE ${LANG_ENGLISH} "Installs Python core engine. This component is required and can not be deselected."
30-
/*
3130
LangString DESC_IDE_PYSCRIPTER ${LANG_ENGLISH} "PyScripter is a free and open-source Python Integrated Development Environment (IDE)."
31+
/*
3232
LangString DESC_MODULE_NUMPY ${LANG_ENGLISH} "NumPy is the fundamental package needed for scientific computing with Python."
3333
LangString DESC_MODULE_SCIPY ${LANG_ENGLISH} "SciPy is open-source software for mathematics, science, and engineering"
3434
LangString DESC_MODULE_PYWIN32 ${LANG_ENGLISH} "Python Extensions for Windows"

‎Robot/modules.nsh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ SectionGroup "Robot `pip` packages"
242242
AddSize 3900
243243
SectionIn 1 2 3 RO
244244
; nsExec::ExecToLog '$Pip install robotframework'
245-
nsExec::ExecToLog '$Pip install robotframework==2.8.7'
245+
nsExec::ExecToLog '$Pip install robotframework>=2.9.2'
246246

247247
SetOutPath "$INSTDIR\"
248248
File "${SOURCESFOLDER}\robot_scripts\README.*"
@@ -263,7 +263,7 @@ SectionGroup "Robot `pip` packages"
263263
Section "robotframework-ride (via pip)" PIP_MODULE_ROBOT_RIDE
264264
AddSize 11000
265265
SectionIn 1 3
266-
nsExec::ExecToLog '$Pip install robotframework-ride==1.4.1'
266+
nsExec::ExecToLog '$Pip install robotframework-ride>=1.5'
267267
SectionEnd
268268

269269
SectionGroupEnd

‎Robot/scripts/CHANGES.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Changes in PortablePythonWithRobot Build environment
22
====================================================
33

4+
PortablePythonWithRobot v2710.292.1 (Dec. 2015)
5+
-----------------------------------------------------------
6+
support of Ride 1.5 with Robotframework 2.9.2 #4
7+
48
PortablePythonWithRobot v2710.287.1 (Nov. 2015)
59
-----------------------------------------------------------
610

‎Robot/scripts/README.htm‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<!--?xml version="1.0" encoding="utf-8" ?-->
22
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3-
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4-
<head>
5-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6-
<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
3+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
4+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5+
<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/">
76
<title>Portable Python with Robot Framework (for Magik testing)</title>
87
<style type="text/css">
98

@@ -355,17 +354,18 @@ <h1>Intention</h1>
355354
</ul>
356355
<p>Hope this helps you in your daily work in testing the interacting of Smallworld GIS with
357356
web applications or other systems.</p>
358-
<p>Have fun with tests, 08. Nov. 2015
359-
<a class="reference external" href="mailto://luiko.czub&#64;liegkat-archiv.de">Luiko Czub</a></p>
357+
<p>Have fun with tests, 16. Dec. 2015
358+
<a class="reference external" href="mailto://luiko.czub@liegkat-archiv.de">Luiko Czub</a></p>
360359
</div>
361360
<div class="section" id="download-installation">
362361
<h1>Download &amp; Installation</h1>
363362
<p>The installer can be retrieved from <a class="reference external" href="https://github.com/lczub/PortablePythonWithRobot/releases">GitHup Releases</a> or <a class="reference external" href="http://sourceforge.net/projects/portablepythonwithrobot/">SourceForge</a>.</p>
364363
<p>Changes are documented in <a class="reference external" href="CHANGES.rst">CHANGES</a>.</p>
365364
<div class="section" id="known-problems">
366365
<h2>Known Problems</h2>
367-
<p>If PPR should be used to start and test Smallworld Magik images, please choose an installation path name without spaces. Details <a class="reference external" href="https://github.com/lczub/PortablePythonWithRobot/issues/2">issue 2</a>.</p>
368-
<p>First start of PyScripter prompts an error &quot;C:App not found&quot;, but continues.</p>
366+
<p>If PPR should be used to start and test Smallworld Magik images,
367+
please choose an installation path name without spaces. Details <a class="reference external" href="https://github.com/lczub/PortablePythonWithRobot/issues/2">issue 2</a>.</p>
368+
<p>First start of PyScripter prompts an error "C:App not found", but continues.</p>
369369
</div>
370370
</div>
371371
<div class="section" id="directory-layout">
@@ -390,8 +390,8 @@ <h1>Directory Layout</h1>
390390
<div class="section" id="documentations">
391391
<h1>Documentations</h1>
392392
<ul class="simple">
393-
<li>Robot Framework User Guide <a class="reference external" href="robot/docs/robotframework-userguide-2.8.7/RobotFrameworkUserGuide.html">robot/docs/robotframework-userguide-2.8.7/RobotFrameworkUserGuide.html</a></li>
394-
<li>keywords standard test libraries <a class="reference external" href="robot/docs/robotframework-userguide-2.8.7/libraries">robot/docs/robotframework-userguide-2.8.7/libraries</a></li>
393+
<li>Robot Framework User Guide <a class="reference external" href="robot/docs/robotframework-userguide-2.9.2/RobotFrameworkUserGuide.html">robot/docs/robotframework-userguide-2.9.2/RobotFrameworkUserGuide.html</a></li>
394+
<li>keywords standard test libraries <a class="reference external" href="robot/docs/robotframework-userguide-2.9.2/libraries">robot/docs/robotframework-userguide-2.9.2/libraries</a></li>
395395
<li>keywords Selenium2Library <a class="reference external" href="robot/docs/Selenium2Library.html">robot/docs/Selenium2Library.html</a></li>
396396
<li>keywords Robot Framework Magik Base <a class="reference external" href="robot/docs/robot_magik_base.html">robot/docs/robot_magik_base.html</a></li>
397397
<li>keywords Robot Framework Magik DsView <a class="reference external" href="robot/docs/robot_magik_dsview.html">robot/docs/robot_magik_dsview.html</a></li>
@@ -401,11 +401,11 @@ <h1>Documentations</h1>
401401
</div>
402402
<div class="section" id="package-details">
403403
<h1>Package Details</h1>
404-
<table border="1" class="docutils">
404+
<table class="docutils" border="1">
405405
<colgroup>
406-
<col width="19%" />
407-
<col width="41%" />
408-
<col width="41%" />
406+
<col width="19%">
407+
<col width="41%">
408+
<col width="41%">
409409
</colgroup>
410410
<tbody valign="top">
411411
<tr><td>Package Name</td>
@@ -422,11 +422,11 @@ <h1>Package Details</h1>
422422
</tr>
423423
</tbody>
424424
</table>
425-
<table border="1" class="docutils">
425+
<table class="docutils" border="1">
426426
<colgroup>
427-
<col width="19%" />
428-
<col width="41%" />
429-
<col width="41%" />
427+
<col width="19%">
428+
<col width="41%">
429+
<col width="41%">
430430
</colgroup>
431431
<tbody valign="top">
432432
<tr><td>Package Name</td>
@@ -443,19 +443,19 @@ <h1>Package Details</h1>
443443
</tr>
444444
</tbody>
445445
</table>
446-
<table border="1" class="docutils">
446+
<table class="docutils" border="1">
447447
<colgroup>
448-
<col width="19%" />
449-
<col width="41%" />
450-
<col width="41%" />
448+
<col width="19%">
449+
<col width="41%">
450+
<col width="41%">
451451
</colgroup>
452452
<tbody valign="top">
453453
<tr><td>Package Name</td>
454454
<td><a class="reference external" href="http://robotframework.org/">Robot Framework</a></td>
455455
<td><a class="reference external" href="https://github.com/rtomac/robotframework-selenium2library/#readme">Selenium2Library</a></td>
456456
</tr>
457457
<tr><td>Version</td>
458-
<td>2.8.7</td>
458+
<td>2.9.2</td>
459459
<td>&gt;= 1.7.4</td>
460460
</tr>
461461
<tr><td>License</td>
@@ -464,19 +464,19 @@ <h1>Package Details</h1>
464464
</tr>
465465
</tbody>
466466
</table>
467-
<table border="1" class="docutils">
467+
<table class="docutils" border="1">
468468
<colgroup>
469-
<col width="19%" />
470-
<col width="41%" />
471-
<col width="41%" />
469+
<col width="19%">
470+
<col width="41%">
471+
<col width="41%">
472472
</colgroup>
473473
<tbody valign="top">
474474
<tr><td>Package Name</td>
475475
<td><a class="reference external" href="https://github.com/robotframework/RIDE/wiki/How-To">Ride</a></td>
476-
<td><a class="reference external" href="http://wxpython.org">wxPython</a></td>
476+
<td><a class="reference external" href="http://wxpython.org/">wxPython</a></td>
477477
</tr>
478478
<tr><td>Version</td>
479-
<td>1.4.1</td>
479+
<td>1.5</td>
480480
<td>2.8.12.1</td>
481481
</tr>
482482
<tr><td>License</td>
@@ -485,11 +485,11 @@ <h1>Package Details</h1>
485485
</tr>
486486
</tbody>
487487
</table>
488-
<table border="1" class="docutils">
488+
<table class="docutils" border="1">
489489
<colgroup>
490-
<col width="19%" />
491-
<col width="41%" />
492-
<col width="41%" />
490+
<col width="19%">
491+
<col width="41%">
492+
<col width="41%">
493493
</colgroup>
494494
<tbody valign="top">
495495
<tr><td>Package Name</td>
@@ -506,11 +506,11 @@ <h1>Package Details</h1>
506506
</tr>
507507
</tbody>
508508
</table>
509-
<table border="1" class="docutils">
509+
<table class="docutils" border="1">
510510
<colgroup>
511-
<col width="19%" />
512-
<col width="41%" />
513-
<col width="41%" />
511+
<col width="19%">
512+
<col width="41%">
513+
<col width="41%">
514514
</colgroup>
515515
<tbody valign="top">
516516
<tr><td>Package Name</td>
@@ -519,7 +519,7 @@ <h1>Package Details</h1>
519519
</tr>
520520
<tr><td>Version</td>
521521
<td>20150901</td>
522-
<td>201509018</td>
522+
<td>20150901</td>
523523
</tr>
524524
<tr><td>License</td>
525525
<td>---</td>
@@ -531,5 +531,6 @@ <h1>Package Details</h1>
531531
<a class="reference external" href="https://www.tele3.cz/jbar/rest/about.html">reStructuredText online renderer</a>.</p>
532532
</div>
533533
</div>
534-
</body>
535-
</html>
534+
535+
536+
</body></html>

‎Robot/scripts/README.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ It is named **PortablePythonWithRobot** (PPR) and includes
1919
Hope this helps you in your daily work in testing the interacting of Smallworld GIS with
2020
web applications or other systems.
2121

22-
Have fun with tests, 08. Nov. 2015
22+
Have fun with tests, 16. Dec. 2015
2323
`Luiko Czub`_
2424

2525
Download & Installation
@@ -63,8 +63,8 @@ ride_*_robot_tests.bat
6363
Documentations
6464
==============
6565

66-
- Robot Framework User Guide `<robot/docs/robotframework-userguide-2.8.7/RobotFrameworkUserGuide.html>`_
67-
- keywords standard test libraries `<robot/docs/robotframework-userguide-2.8.7/libraries>`_
66+
- Robot Framework User Guide `<robot/docs/robotframework-userguide-2.9.2/RobotFrameworkUserGuide.html>`_
67+
- keywords standard test libraries `<robot/docs/robotframework-userguide-2.9.2/libraries>`_
6868
- keywords Selenium2Library `<robot/docs/Selenium2Library.html>`_
6969
- keywords Robot Framework Magik Base `<robot/docs/robot_magik_base.html>`_
7070
- keywords Robot Framework Magik DsView `<robot/docs/robot_magik_dsview.html>`_
@@ -88,13 +88,13 @@ License Open Source Software
8888

8989
============= ============================ ============================
9090
Package Name `Robot Framework`_ `Selenium2Library`_
91-
Version 2.8.7 >= 1.7.4
91+
Version 2.9.2 >= 1.7.4
9292
License `Apache License 2.0`_ `Apache License 2.0`_
9393
============= ============================ ============================
9494

9595
============= ============================ ============================
9696
Package Name `Ride`_ `wxPython`_
97-
Version 1.4.1 2.8.12.1
97+
Version 1.5 2.8.12.1
9898
License `Apache License 2.0`_ `wxWindows Library Licence`_
9999
============= ============================ ============================
100100

@@ -106,7 +106,7 @@ License `Apache License 2.0`_ `GPL 3.0`_
106106

107107
============= ============================ ============================
108108
Package Name `RobotDemo`_ `WebDemo`_
109-
Version 20150901 201509018
109+
Version 20150901 20150901
110110
License --- ---
111111
============= ============================ ============================
112112

‎Robot/settings.bat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ call %PP_BASE%\settings.bat
2929

3030
:: robot spezific settings
3131
set PY_VERSION=2710
32-
set PP_VERSION=287.1.0
32+
set PP_VERSION=292.1.0
3333
set PY_SHORT_VERSION=27
3434
rem set TEMP=%~dp0..\build
3535

@@ -56,9 +56,9 @@ set PPR_ROBOTMAGIK_FILE=robotframework-magik-0.3.2-42.zip
5656
set PPR_ROBOTMAGIK_MD5=fcaac6d203674c4e0151b7639ea890c8
5757

5858
:: Robot Framework User Guide
59-
set PPR_ROBOTUSERGUIDE_DOWNLOAD=http://robotframework.org/robotframework/robotframework-userguide-2.8.7.zip
60-
set PPR_ROBOTUSERGUIDE_FILE=robotframework-userguide-2.8.7.zip
61-
set PPR_ROBOTUSERGUIDE_MD5=f0f25da743831a4cdb17646b685f8460
59+
set PPR_ROBOTUSERGUIDE_DOWNLOAD=http://robotframework.org/robotframework/robotframework-userguide-2.9.2.zip
60+
set PPR_ROBOTUSERGUIDE_FILE=robotframework-userguide-2.9.2.zip
61+
set PPR_ROBOTUSERGUIDE_MD5=47bbc429c227a1c1af3ec1d8d4c71ad8
6262

6363

6464

0 commit comments

Comments
 (0)