Merge pull request #2964 from robotframework/develop

Prepare version 2.1.4

Author: HelioGuilherme66

.github/workflows/fedora_41.yml

@@ -104,7 +104,7 @@ jobs:
         git submodule update --init --recursive
         source /home/wxpy/venvs/Py314/bin/activate
         pip install .
-        xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
+        xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
         sleep 10
         killall xvfb-run
  

.github/workflows/linux.yml

@@ -92,13 +92,13 @@ jobs:
       run: |
         git submodule update --init --recursive
         pip install .
-        xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
+        xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
         sleep 10
         killall xvfb-run
       
   debian:
     name: Debian
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
     if: ${{ !contains(github.ref, '/fedora/') }}
@@ -113,12 +113,10 @@ jobs:
     - name: Setup environment
       run: |
         sudo apt update -y
-        sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4
+        sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4 wxpython-tools
         git submodule update --init --recursive
-        pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
         pip install -r requirements-dev.txt
         pip install robotframework
-        pip install --force -U setuptools==69.5.1
     - name: Run tests
       run: |
         Xvfb &
@@ -137,7 +135,9 @@ jobs:
     - name: Install and run
       run: |
         git submodule update --init --recursive
+        pip install -r requirements-dev.txt
+        pip install robotframework
         pip install .
-        xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
+        xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
         sleep 10
         killall xvfb-run

.github/workflows/package.yml

@@ -0,0 +1,109 @@
+name: Linux
+on:
+  push:
+    branches-ignore:
+      - '**/sources/**'
+      - '**/windows/**'
+      - '**/macos/**'
+    paths-ignore:
+      - '.github/workflows/sources.yml'
+      - '.github/workflows/sonar.yml'
+      - '.github/workflows/macos.yml'
+      - '.github/workflows/windows.yml'
+      - 'tools/**'
+      - 'rtest/**'
+      - 'doc/**'
+      - '.appveyor.yml'
+      - '.coveragerc'
+      - '.gitattributes'
+      - '.pylintrc'
+      - '.travis.yml'
+      - '.whitesource'
+      - 'AUTHORS.txt'
+      - 'BUILD.rest'
+      - 'CHANGELOG.adoc'
+      - 'CONTRIBUTING.adoc'
+      - 'COPYRIGHT.txt'
+      - 'LICENSE.txt'
+      - 'MANIFEST.in'
+      - 'README.adoc'
+      - 'README.rest'
+      - 'rfgen.py'
+      - 'tox.ini'
+  pull_request:
+    paths-ignore:
+      - '.github/workflows/sources.yml'
+      - '.github/workflows/sonar.yml'
+      - '.github/workflows/macos.yml'
+      - '.github/workflows/windows.yml'
+      - 'tools/**'
+      - 'rtest/**'
+      - 'doc/**'
+      - '.appveyor.yml'
+      - '.coveragerc'
+      - '.gitattributes'
+      - '.pylintrc'
+      - '.travis.yml'
+      - '.whitesource'
+      - 'AUTHORS.txt'
+      - 'BUILD.rest'
+      - 'CHANGELOG.adoc'
+      - 'CONTRIBUTING.adoc'
+      - 'COPYRIGHT.txt'
+      - 'LICENSE.txt'
+      - 'MANIFEST.in'
+      - 'README.adoc'
+      - 'README.rest'
+      - 'rfgen.py'
+      - 'tox.ini'
+
+jobs:
+  fedora:
+    name: Fedora py313
+    runs-on: ubuntu-22.04
+    container:
+      image: fedora:41
+      options: --privileged
+    steps:
+    - name: Configure container environment
+      run: |
+        sudo dnf update -y
+        sudo dnf install -y git
+        git config --global --add safe.directory ${GITHUB_WORKSPACE}
+    - uses: actions/[email protected]
+      with:
+        submodules: false
+    - name: Setup environment
+      run: |
+        sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip python3-tkinter psmisc
+        # sudo dnf downgrade -y mesa* --refresh
+        git submodule update --init --recursive
+        pip install -r requirements-dev.txt
+        pip install robotframework
+    - name: Run tests
+      run: |
+        Xvfb &
+        export DISPLAY=:0
+        export GITHUB_ACTIONS=True
+        git submodule update --init --recursive
+        invoke test-ci
+    - uses: actions/upload-artifact@v4
+      with:
+        name: coverage-report
+        include-hidden-files: true
+        path: |
+          .coverage.1
+          .coverage.2
+          .coverage-reports/coverage.xml
+          .coverage-reports/htmlcov
+    - name: Create Package
+      run: |
+        git submodule update --init --recursive
+        pip install -r requirements-dev.txt
+        python -m build
+    - uses: actions/upload-artifact@v4
+      with:
+        name: package
+        include-hidden-files: true
+        path: |
+          dist/*

.github/workflows/sonar.yml

@@ -8,15 +8,15 @@ on:
 jobs:
   sonarcloud:
     name: SonarCloud
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Update ubuntu
         run: sudo apt update -y
       - name: Install missing library
-        run: sudo apt-get install libnotify4 libsdl1.2debian libsdl2.2 -y
+        run: sudo apt-get install libnotify4 libsdl1.2debian libsdl2.2 wxpython-tools -y
       - name: Install xorg
         run: sudo apt-get install -y xorg openbox
       - name: Install Xvfb
@@ -27,18 +27,18 @@ jobs:
           python-version: ${{ matrix.python }}
       - name: Install invoke and any other packages
         run: pip install coverage invoke pytest
-      - name: Install wxPython
-        run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
       - name: Install RIDE dependencies
         run: |
              git submodule update --init --recursive
              pip install -r requirements-dev.txt
-             pip install --force -U setuptools==69.5.1
+             pip install robotframework
       - name: Run Xvfb
         run: Xvfb :1 -noreset &
       - name: Test Install RIDE
         run: |
              git submodule update --init --recursive
+             pip install -r requirements-dev.txt
+             pip install robotframework
              pip install .
       - name: Run RIDE unit-tests
         run: |

BUILD.rest

@@ -39,17 +39,13 @@ wxPython
 Version 2.8.12.1 of wxPython__ was the last for the 2 series.
 Together with version 3.0.2, they are called the wxPython Classic.
 
-The current recommended version of wxPython is 4.0.7.post2 and was called wxPhoenix.
-RIDE is not fully compatible with newest wxPython 4.1.
-
-RIDE on Python 2.7 still runs with any version of those Classic or wxPhoenix.
-On Python 3.6+, only wxPhoenix is supported (and in the future we will only
-support those).
+The current recommended version of wxPython is 4.2.3, the project was called wxPhoenix.
 
 **VERSION 1.7.4.2 IS THE LAST RELEASE SUPPORTING PYTHON 2.7 AND WXPYTHON <3.0.3**
 
-**wxPython will be updated to current version 4.0.7.post2**
+**Version 2.0.8.1 was the last release supporting Python 3.6 and 3.7**
 
+<!--
 For testing purposes, users can select which version to use, by creating the
 file ``wx.pth`` containing the directory name of the wxPython to use. That 
 directory must contain the two wxPython directories (moved into)::
@@ -69,6 +65,7 @@ Example::
     # wx-4.0.4
     # wx-4.0.6
     # wx-4.0.7
+-->
 
 
 It is highly recommended, if you want to program with wxPython to download and
@@ -96,6 +93,11 @@ Unit tests are in `utest` directory. They can be executed with::
 
   invoke test
 
+or, to have coverage report:
+
+  invoke test-ci
+
+
 There is also a shell script (requiring customization for your environment).
 It allows to run the test files stopping when errors are found.
 Example::
@@ -169,10 +171,9 @@ Creating distributions
 
       invoke clean
 
-3. Create and validate source distribution in zip format and universal (i.e.
-   Python 2 and 3 compatible) `wheel <http://pythonwheels.com>`_::
+3. Create and validate source distribution and `wheel <http://pythonwheels.com>`_::
 
-      python setup.py sdist --formats zip bdist_wheel --universal
+      python -m build
       ls -l dist
       twine check dist/*
 
@@ -190,7 +191,7 @@ Creating distributions
       pip install --pre --upgrade robotframework-ride
 
 
-* Announce on usergroup, robot homepage, forum, slack, and twitter
+* Announce on usergroup, robot homepage, forum, slack, and LinkedIn
 
 
 Settings migration

CHANGELOG.adoc

@@ -9,6 +9,9 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 == https://github.com/robotframework/RIDE[Unreleased]
 
 === Added
+- Added Tools->Library Finder... to install libraries and Help->Open Library Documentation... . They share the same dialog, and definitions are recorded in ``settings.cfg``.
+- Added context menu to install libraries and to open documentation in Grid Editor Import section. Same as above description.
+- Added keyboard shortcuts ``Ctrl-Shift-Up`` and ``Ctrl-Shift-Down`` as alternatives to ``Alt-Up`` and ``Alt-Down`` to move rows in Grid and Text Editors.
 - Added Settings Editor button to Preferences dialog, to edit settings.cfg.
 - Created backup of settings.cfg to allow recovering some settings when broken upgrades.
 - Added current executing keyword and other statuses to TestRunner status bar.
@@ -18,6 +21,15 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 when selecting in Tree shows the filename in StatusBar.
 
 === Changed
+- Improved vertical scroll in Grid Editor, by having main scroll bars out of cells
+- Changed arguments parser to allow ``--version`` and ``--help`` functional in Windows
+- Improved auto-complete in Grid Editor, to allow several matches
+- Changed some informative dialogs and JSON Editor to use the customized colors.
+- Modified import statements to allow running RIDE without Robot Framework installed or versions older than 6.0.
+- On Windows ignore false modification on files when opening Test Suites, causing confirmation dialog.
+
+=== Fixed
+- Fixed Create Desktop Shortcut by pointing executable to ``python -m robotide``.
 - Changed some informative dialogs and JSON Editor to use the customized colors.
 - Modified import statements to allow running RIDE without Robot Framework installed or versions older than 6.0.
 - On Windows ignore false modification on files when opening Test Suites, causing confirmation dialog.

README.adoc

@@ -41,7 +41,7 @@ Likewise, the current version of wxPython, is 4.2.3, but RIDE is known to work w
 
 `pip install -U robotframework-ride`
 
-(3.8 <= python <= 3.13) Install current development version (**2.2dev25**) with:
+(3.8 <= python <= 3.13) Install current development version (**2.2dev31**) with:
 
 `pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
 

requirements-dev.txt

@@ -1,16 +1,19 @@
-setuptools>=70.0.0
+setuptools>=78.1.1
+build
 mockito
 invoke
 urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
 zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
-requests>=2.32.3
+requests>=2.32.4
 github3.py
 memory-profiler
 pylint
 pytest
 coverage
 pytest-cov
+pytest-html
 pytest-order
+packaging >= 24.2
 # To make a relase you need asciidoc3 (a2x3)
 # asciidoc3
 # Include also normal project requirements.