Skip to content

Commit f303a14

Browse files
HelioGuilherme66HelioGuilherme66
committed
Merge branch 'master' into l10n_master
2 parents 441e487 + bfbbf79 commit f303a14

96 files changed

Lines changed: 7927 additions & 4622 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/fedora_41.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux
1+
name: Fedora 41
22
on:
33
push:
44
branches-ignore:
@@ -71,7 +71,7 @@ jobs:
7171
sudo dnf update -y
7272
sudo dnf install -y git python3-tkinter
7373
git config --global --add safe.directory ${GITHUB_WORKSPACE}
74-
- uses: actions/checkout@v3.3.0
74+
- uses: actions/checkout@v6
7575
with:
7676
submodules: false
7777
- name: Setup environment
@@ -90,6 +90,9 @@ jobs:
9090
export GITHUB_ACTIONS=True
9191
git submodule update --init --recursive
9292
source /home/wxpy/venvs/Py314/bin/activate
93+
pip install -r requirements-dev.txt
94+
pip install robotframework
95+
pip install .
9396
invoke test-ci
9497
- uses: actions/upload-artifact@v4
9598
with:

‎.github/workflows/linux.yml‎

Lines changed: 97 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux
1+
name: Linuxes Python Matrix
22
on:
33
push:
44
branches-ignore:
@@ -60,87 +60,110 @@ on:
6060
jobs:
6161
fedora:
6262
name: Fedora py313
63-
runs-on: ubuntu-22.04
63+
runs-on: ubuntu-latest
6464
if: ${{ !contains(github.ref, '/debian/') }}
6565
container:
66-
image: fedora:41
66+
image: fedora:44
6767
options: --privileged
6868
steps:
69-
- name: Configure container environment
70-
run: |
71-
sudo dnf update -y
72-
sudo dnf install -y git python3-tkinter
73-
git config --global --add safe.directory ${GITHUB_WORKSPACE}
74-
- uses: actions/checkout@v3.3.0
75-
with:
76-
submodules: false
77-
- name: Setup environment
78-
run: |
79-
sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip python3-tkinter psmisc
80-
# sudo dnf downgrade -y mesa* --refresh
81-
git submodule update --init --recursive
82-
python -m pip install -U pip
83-
pip install -r requirements-dev.txt
84-
pip install robotframework
85-
- name: Run tests
86-
run: |
87-
Xvfb &
88-
export DISPLAY=:0
89-
export GITHUB_ACTIONS=True
90-
git submodule update --init --recursive
91-
invoke test-ci
92-
- name: Install and run
93-
run: |
94-
git submodule update --init --recursive
95-
pip install .
96-
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
97-
sleep 10
98-
killall xvfb-run
99-
69+
- name: Configure container environment
70+
run: |
71+
sudo dnf update -y
72+
sudo dnf install -y git python3-tkinter
73+
git config --global --add safe.directory ${GITHUB_WORKSPACE}
74+
- uses: actions/checkout@v6
75+
with:
76+
submodules: false
77+
- name: Setup environment
78+
run: |
79+
sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip python3-tkinter psmisc
80+
# sudo dnf downgrade -y mesa* --refresh
81+
git submodule update --init --recursive
82+
python -m pip install -U pip
83+
pip install -r requirements-dev.txt
84+
pip install robotframework
85+
- name: Run tests
86+
run: |
87+
Xvfb &
88+
export DISPLAY=:0
89+
export GITHUB_ACTIONS=True
90+
git submodule update --init --recursive
91+
pip install .
92+
invoke test-ci
93+
- name: Install and run
94+
run: |
95+
git submodule update --init --recursive
96+
pip install .
97+
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
98+
sleep 10
99+
killall xvfb-run
100+
100101
debian:
101102
name: Debian
102103
runs-on: ubuntu-latest
103104
strategy:
104105
fail-fast: false
106+
matrix:
107+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
105108
if: ${{ !contains(github.ref, '/fedora/') }}
106109
steps:
107-
- uses: actions/checkout@v3.3.0
108-
with:
109-
submodules: false
110-
- name: Fetch tags
111-
run: |
112-
git fetch --prune --depth=1 --recurse-submodules
113-
git submodule update --init --recursive
114-
- name: Setup environment
115-
run: |
116-
sudo apt update -y
117-
sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4 wxpython-tools
118-
git submodule update --init --recursive
119-
python -m pip install -U pip
120-
pip install -r requirements-dev.txt
121-
pip install robotframework
122-
- name: Run tests
123-
run: |
124-
Xvfb &
125-
export DISPLAY=:0
126-
git submodule update --init --recursive
127-
invoke test-ci
128-
- uses: actions/upload-artifact@v4
129-
with:
130-
name: coverage-report
131-
include-hidden-files: true
132-
path: |
133-
.coverage.1
134-
.coverage.2
135-
.coverage.3
136-
.coverage-reports/coverage.xml
137-
.coverage-reports/htmlcov
138-
- name: Install and run
139-
run: |
140-
git submodule update --init --recursive
141-
pip install -r requirements-dev.txt
142-
pip install robotframework
143-
pip install .
144-
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
145-
sleep 10
146-
killall xvfb-run
110+
- uses: actions/checkout@v6
111+
with:
112+
submodules: false
113+
- name: Set up Python ${{ matrix.python-version }}
114+
uses: actions/setup-python@v5
115+
with:
116+
python-version: ${{ matrix.python-version }}
117+
- name: Fetch tags
118+
run: |
119+
git fetch --prune --depth=1 --recurse-submodules
120+
git submodule update --init --recursive
121+
- name: Setup environment
122+
run: |
123+
sudo apt update -y
124+
sudo apt-get install -y --no-install-recommends --no-install-suggests libsdl1.2debian libsdl2-2.0-0 libnotify4
125+
git submodule update --init --recursive
126+
python -m pip install -U pip
127+
minor=$(echo "${{ matrix.python-version }}" | cut -d . -f 2)
128+
if [ $minor -lt 10 ]; then
129+
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxpython-4.2.4-cp39-cp39-linux_x86_64.whl
130+
elif [ $minor -lt 11 ]; then
131+
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxpython-4.2.5-cp310-cp310-linux_x86_64.whl
132+
elif [ $minor -lt 12 ]; then
133+
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxpython-4.2.5-cp311-cp311-linux_x86_64.whl
134+
elif [ $minor -lt 13 ]; then
135+
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxpython-4.2.5-cp312-cp312-linux_x86_64.whl
136+
elif [ $minor -lt 14 ]; then
137+
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxpython-4.2.5-cp313-cp313-linux_x86_64.whl
138+
elif [ $minor -lt 15 ]; then
139+
python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-24.04/wxpython-4.2.5-cp314-cp314-linux_x86_64.whl
140+
else
141+
sudo apt install python3-wxgtk4.0
142+
fi
143+
pip install -r requirements-dev.txt
144+
pip install robotframework
145+
- name: Run tests
146+
run: |
147+
Xvfb &
148+
export DISPLAY=:0
149+
git submodule update --init --recursive
150+
invoke test-ci
151+
- uses: actions/upload-artifact@v4
152+
with:
153+
name: coverage-report
154+
include-hidden-files: true
155+
path: |
156+
.coverage.1
157+
.coverage.2
158+
.coverage.3
159+
.coverage-reports/coverage.xml
160+
.coverage-reports/htmlcov
161+
- name: Install and run
162+
run: |
163+
git submodule update --init --recursive
164+
pip install -r requirements-dev.txt
165+
pip install robotframework
166+
pip install .
167+
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride &
168+
sleep 10
169+
killall xvfb-run

‎.github/workflows/package.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux
1+
name: Package
22
on:
33
push:
44
branches-ignore:
@@ -70,7 +70,7 @@ jobs:
7070
sudo dnf update -y
7171
sudo dnf install -y git
7272
git config --global --add safe.directory ${GITHUB_WORKSPACE}
73-
- uses: actions/checkout@v3.3.0
73+
- uses: actions/checkout@v6
7474
with:
7575
submodules: false
7676
- name: Setup environment
@@ -95,6 +95,7 @@ jobs:
9595
path: |
9696
.coverage.1
9797
.coverage.2
98+
.coverage.3
9899
.coverage-reports/coverage.xml
99100
.coverage-reports/htmlcov
100101
- name: Create Package

‎.github/workflows/sonar.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: SonarCloud
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v6
1414
with:
1515
fetch-depth: 0
1616
- name: Update ubuntu
@@ -45,6 +45,9 @@ jobs:
4545
run: |
4646
export DISPLAY=:1
4747
git submodule update --init --recursive
48+
pip install -r requirements-dev.txt
49+
pip install robotframework
50+
pip install .
4851
invoke test-ci
4952
- name: Analyze with SonarCloud
5053
uses: sonarsource/sonarqube-scan-action@master

‎CHANGELOG.adoc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
88

99
// == https://github.com/robotframework/RIDE[Unreleased]
1010

11+
== https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.2.4.rst[2.2.4] - 2026-07-09
12+
13+
=== Fixed
14+
- Fixed 'background assign' setting in Grid Editor preferences.
15+
16+
=== Changed
17+
- Changed Auto-Save to only save when user is not typing, and if code is in error show message in status bar.
18+
- Applied STC_LEX colorization on Code Editor (external files editor).
19+
1120
== https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.2.3.rst[2.2.3] - 2026-06-10
1221

1322

‎README.adoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ You can use the tag *robotframework-ide* to search and ask on https://stackoverf
2525

2626
== **Welcome to the development version of RIDE - next major release will be version 2.3**
2727

28-
If you are looking for the latest released version, you can get the source code from **https://github.com/robotframework/RIDE/releases[releases]** or from branch **https://github.com/robotframework/RIDE/tree/release/2.2.3[release/2.2.3]**
28+
If you are looking for the latest released version, you can get the source code from **https://github.com/robotframework/RIDE/releases[releases]** or from branch **https://github.com/robotframework/RIDE/tree/release/2.2.4[release/2.2.4]**
2929

30-
See the https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.2.3.rst[release notes] for latest release version 2.2.3
30+
See the https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.2.4.rst[release notes] for latest release version 2.2.4
3131

3232
**Version https://github.com/robotframework/RIDE/tree/release/2.2[2.2] was the last release supporting Python 3.8**
3333

@@ -42,11 +42,11 @@ Currently, the unit tests are tested on Python 3.10, 3.11 and 3.14.
4242
We now have an experimental workflow on Fedora Linux 42, with wxPython 4.2.4 and Python 3.14.
4343
Likewise, the current version of wxPython, is 4.2.5, but RIDE is known to work with 4.0.7, 4.1.1, 4.2.2, 4.2.3, 4.2.4 and 4.2.5 versions.
4444

45-
(3.9 <= python <= 3.14) Install current released version (*2.2.3*) with:
45+
(3.9 <= python <= 3.14) Install current released version (*2.2.4*) with:
4646

4747
`pip install -U robotframework-ride`
4848

49-
(3.9 <= python <= 3.14) Install current development version (**2.2.3dev12**) with:
49+
(3.9 <= python <= 3.14) Install current development version (**2.2.5dev1**) with:
5050

5151
`pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
5252

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ You can use the tag *robotframework-ide* to search and ask on [StackOverflow](ht
2121

2222
## **Welcome to RIDE - next major release will be version 2.3**
2323

24-
If you are looking for the latest released version, you can get the source code from **[releases](https://github.com/robotframework/RIDE/releases)** or from branch **[release/2.2.3](https://github.com/robotframework/RIDE/tree/release/2.2.3)**
24+
If you are looking for the latest released version, you can get the source code from **[releases](https://github.com/robotframework/RIDE/releases)** or from branch **[release/2.2.4](https://github.com/robotframework/RIDE/tree/release/2.2.3)**
2525

26-
See the [release notes](https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.2.3.rst) for latest release version 2.2.3
26+
See the [release notes](https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.2.4.rst) for latest release version 2.2.4
2727

2828
**Version [2.2](https://github.com/robotframework/RIDE/tree/release/2.2) was the last release supporting Python 3.8**
2929

@@ -32,13 +32,13 @@ See the [release notes](https://github.com/robotframework/RIDE/blob/master/doc/r
3232
**Version [1.7.4.2](https://github.com/robotframework/RIDE/tree/release/1.7.4.2) was the last release supporting Python 2.7**
3333

3434

35-
**The current development version is based on 2.2.3, supports Python from 3.9 up to 3.14 (07th January 2026).**
35+
**The current development version is based on 2.2.4, supports Python from 3.9 up to 3.14 (09th July 2026).**
3636

3737
Currently, the unit tests are tested on Python 3.10, 3.11 and 3.14.
3838
We now have an experimental workflow on Fedora Linux 42, with wxPython 4.2.4 and Python 3.14.
3939
Likewise, the current version of wxPython, is 4.2.5, but RIDE is known to work with 4.0.7, 4.1.1, 4.2.2, 4.2.3, 4.2.4 and 4.2.5 versions.
4040

41-
(3.9 <= python <= 3.14) Install current released version (*2.2.3*) with:
41+
(3.9 <= python <= 3.14) Install current released version (*2.2.4*) with:
4242

4343
`pip install -U robotframework-ride`
4444

0 commit comments

Comments
 (0)