Skip to content

Commit 425ac8f

Browse files
HelioGuilherme66HelioGuilherme66
authored
Merge pull request #2911 from HelioGuilherme66/fix_goto_definition_after_change
Fix goto definition after change
2 parents a1bca91 + 7e5a888 commit 425ac8f

Some content is hidden

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

58 files changed

+2159
-3125
lines changed

‎.github/workflows/linux.yml

+15-8
Original file line numberDiff line numberDiff line change
@@ -66,27 +66,30 @@ jobs:
6666
image: fedora:latest
6767
options: --privileged
6868
steps:
69-
- uses: actions/checkout@v3.3.0
70-
with:
71-
submodules: false
7269
- name: Configure container environment
7370
run: |
7471
sudo dnf update -y
7572
sudo dnf install -y git
7673
git config --global --add safe.directory ${GITHUB_WORKSPACE}
74+
- uses: actions/checkout@v3.3.0
75+
with:
76+
submodules: false
7777
- name: Setup environment
7878
run: |
7979
sudo dnf install -y sdl12-compat python3-wxpython4 xorg-x11-server-Xvfb python3-pip psmisc
80-
sudo dnf downgrade -y mesa* --refresh
81-
sudo -H pip install -r requirements-dev.txt
80+
# sudo dnf downgrade -y mesa* --refresh
81+
git submodule update --init --recursive
82+
pip install -r requirements-dev.txt
8283
- name: Run tests
8384
run: |
8485
Xvfb &
8586
export DISPLAY=:0
8687
export GITHUB_ACTIONS=True
88+
git submodule update --init --recursive
8789
invoke test-ci
8890
- name: Install and run
8991
run: |
92+
git submodule update --init --recursive
9093
pip install .
9194
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
9295
sleep 10
@@ -103,20 +106,24 @@ jobs:
103106
submodules: false
104107
- name: Fetch tags
105108
run: |
106-
git fetch --prune --depth=1 --no-recurse-submodules
109+
git fetch --prune --depth=1 --recurse-submodules
110+
git submodule update --init --recursive
107111
- name: Setup environment
108112
run: |
109113
sudo apt update -y
110114
sudo apt install -y libsdl1.2debian libsdl2-2.0-0 libnotify4
111-
sudo pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
112-
sudo pip install -r requirements-dev.txt
115+
git submodule update --init --recursive
116+
pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
117+
pip install -r requirements-dev.txt
113118
- name: Run tests
114119
run: |
115120
Xvfb &
116121
export DISPLAY=:0
122+
git submodule update --init --recursive
117123
invoke test-ci
118124
- name: Install and run
119125
run: |
126+
git submodule update --init --recursive
120127
pip install .
121128
xvfb-run --server-args="-screen 0, 1280x720x24" -a ride.py &
122129
sleep 10

‎.github/workflows/sonar.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
branches:
55
- master
6+
- develop
7+
- cleanup_code
68
jobs:
79
sonarcloud:
810
name: SonarCloud
@@ -26,16 +28,21 @@ jobs:
2628
- name: Install invoke and any other packages
2729
run: pip install coverage invoke pytest
2830
- name: Install wxPython
29-
run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.0-cp310-cp310-linux_x86_64.whl
31+
run: pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/wxPython-4.2.1-cp310-cp310-linux_x86_64.whl
3032
- name: Install RIDE dependencies
31-
run: pip install -r requirements-dev.txt
33+
run: |
34+
git submodule update --init --recursive
35+
pip install -r requirements-dev.txt
3236
- name: Run Xvfb
3337
run: Xvfb :1 -noreset &
3438
- name: Test Install RIDE
35-
run: pip install .
39+
run: |
40+
git submodule update --init --recursive
41+
pip install .
3642
- name: Run RIDE unit-tests
3743
run: |
3844
export DISPLAY=:1
45+
git submodule update --init --recursive
3946
invoke test-ci
4047
- name: Analyze with SonarCloud
4148
uses: sonarsource/sonarcloud-github-action@master

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "src/robotide/preferences/configobj"]
2+
path = src/robotide/preferences/configobj
3+
url = https://github.com/DiffSK/configobj.git

‎CHANGELOG.adoc

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,18 @@ The format is based on http://keepachangelog.com/en/1.0.0/[Keep a Changelog]
77
and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioning].
88

99

10-
// == https://github.com/robotframework/RIDE[Unreleased]
10+
== https://github.com/robotframework/RIDE[Unreleased]
11+
12+
=== Changed
13+
14+
- Changed the workflow for the development versions of RIDE. Now, development versions are taken from the ``develop`` branch, and the ``master`` will stay with released version.
15+
- Changed the way ``configobj`` code is imported. Now is a submodule obtained from https://github.com/DiffSK/configobj.
16+
17+
=== Fixed
18+
19+
- Fixed broken go to definition after editing content in resource files.
20+
21+
- Fixed long arguments in fixtures appearing splitted in Grid Editor. Still, arguments info will not be correct at calling step.
1122

1223
== https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.rst[2.1] - 2024-10-13
1324

‎MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ recursive-include src *.css *.js *.py *.robot *.txt *.png *.gif *.ico *.cfg *.ht
88
recursive-include doc *.rst
99
recursive-include rtest *.py *.txt
1010
recursive-include src/robotide/postinstall/RIDE.app *.*
11+
recursive-include src/robotide/preferences/configobj/src/configobj *.*
1112
recursive-include src/robotide/localization *.py *.adoc *.pot *.po *.mo
1213

‎README.adoc

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,27 @@ You can use the tag *robotframework-ide* to search and ask on https://stackoverf
2222

2323
== **Welcome to the development version of RIDE - next major release will be version 2.2**
2424

25-
// 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.0.8.1[release/2.0.8.1]**
25+
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.1[release/2.1]**
2626

27-
// See the https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.0.8.1.rst[release notes] for latest release version 2.0.8.1
27+
See the https://github.com/robotframework/RIDE/blob/master/doc/releasenotes/ride-2.1.rst[release notes] for latest release version 2.1
2828

2929
**Version https://github.com/robotframework/RIDE/tree/release/2.0.8.1[2.0.8.1] was the last release supporting Python 3.6 and 3.7**
3030

3131
**Version https://github.com/robotframework/RIDE/tree/release/1.7.4.2[1.7.4.2] was the last release supporting Python 2.7**
3232

3333

34-
**The current development version is based on 2.1, supports Python from 3.8 up to 3.12 (13th October 2024).**
34+
**The current development version is based on 2.1, supports Python from 3.8 up to 3.13 (5th November 2024).**
3535

36-
Currently, the unit tests are tested on Python 3.10, and 3.12 (which is the recommended version).
36+
Currently, the unit tests are tested on Python 3.10, 3.11 and 3.13 (but 3.12 is the recommended version).
3737
Likewise, the current version of wxPython, is 4.2.2, but RIDE is known to work with 4.0.7 and 4.1.1 versions.
3838

39-
(3.6 <= python <= 3.11) Install current released version (*2.1*) with:
39+
(3.8 <= python <= 3.12) Install current released version (*2.1*) with:
4040

4141
`pip install -U robotframework-ride`
4242

43-
(3.8 <= python <= 3.12) Install current development version (**2.1**) with:
43+
(3.8 <= python <= 3.13) Install current development version (**2.1.1**) with:
4444

45-
`pip install -U https://github.com/robotframework/RIDE/archive/master.zip`
45+
`pip install -U https://github.com/robotframework/RIDE/archive/develop.zip`
4646

4747
//(3.8 <= python <= 3.12) Install current Beta version (2.1b1) with:
4848

@@ -55,7 +55,7 @@ Likewise, the current version of wxPython, is 4.2.2, but RIDE is known to work w
5555
== Unit testing statuses:
5656

5757
// Linux (py36, py37, py38, py39): image:https://app.travis-ci.com/HelioGuilherme66/RIDE.svg?branch=master[Unit Tests, link=https://app.travis-ci.com/github/HelioGuilherme66/RIDE]
58-
Linux (Fedora 40: py3.12, Ubuntu 22.04: py3.10): image:https://img.shields.io/github/actions/workflow/status/HelioGuilherme66/RIDE/linux.yml[Unit Tests, link=https://github.com/HelioGuilherme66/RIDE/actions/workflows/linux.yml]
58+
Linux (Fedora 41: py3.13, Ubuntu 22.04: py3.10): image:https://img.shields.io/github/actions/workflow/status/HelioGuilherme66/RIDE/linux.yml[Unit Tests, link=https://github.com/HelioGuilherme66/RIDE/actions/workflows/linux.yml]
5959

6060
Windows (Python 3.11): image:https://ci.appveyor.com/api/projects/status/github/HelioGuilherme66/RIDE?branch=master&svg=true[Unit Tests, link=https://ci.appveyor.com/project/HelioGuilherme66/ride]
6161

‎pytest.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[pytest]
22
addopts = -p no:warnings --order-group-scope=module
3-
3+
pythonpath = src src/robotide/preferences/configobj/src

‎setup.cfg

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ count = False
1010
max_line_length = 90
1111
statistics = True
1212

13+
[options]
14+
packages = find:
15+
include_package_data = true
16+
1317
[options.entry_points]
1418
gui_scripts =
1519
ride = robotide.__main__:main

‎setup.py

+11-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
'psutil',
2929
'Pywin32; sys_platform=="win32"',
3030
'wxPython',
31-
'packaging']
31+
'packaging',
32+
'requests>=2.32.2']
3233

3334
PACKAGE_DATA = {
3435
'robotide.preferences': ['settings.cfg'],
@@ -48,6 +49,14 @@
4849

4950
PACKAGE_DATA['robotide.localization'] = my_list[:]
5051

52+
my_list = []
53+
for curr_dir, _, files in os.walk('src/robotide/preferences/configobj/src/configobj'):
54+
for item in files:
55+
if '.' in item:
56+
my_list.append(os.path.join(curr_dir, item).replace('\\', '/').replace('src/robotide/preferences/configobj/src/configobj/', ''))
57+
58+
PACKAGE_DATA['robotide.preferences.configobj.src.configobj'] = my_list[:]
59+
5160
LONG_DESCRIPTION = """
5261
Robot Framework is a generic test automation framework for acceptance
5362
level testing. RIDE is a lightweight and intuitive editor for Robot
@@ -101,6 +110,7 @@ def run(self):
101110
url='https://github.com/robotframework/RIDE/',
102111
download_url='https://pypi.python.org/pypi/robotframework-ride',
103112
install_requires=REQUIREMENTS,
113+
include_package_data=True,
104114
package_dir={'': SOURCE_DIR},
105115
packages=find_packages(SOURCE_DIR),
106116
package_data=PACKAGE_DATA,

‎sonar-project.properties

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ sonar.projectKey=HelioGuilherme66_RIDE
22
sonar.organization=helioguilherme66
33
sonar.host.url=https://sonarcloud.io
44
sonar.python.version=3.10
5+
sonar.projectVersion=v2.1
56
sonar.sources=src/
67
sonar.tests=utest/
78
sonar.exclusions=**/lib/robot/**/*

0 commit comments

Comments
 (0)