Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade rose edit to Python 3 #2808

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
9c6b6e7
Remove dead_ends for config-edit and edit. Add in entry point for ros…
astroDimitrios Aug 2, 2024
52ce070
Add config_editor dir created by running 2to3 and the pygobject conve…
astroDimitrios Aug 2, 2024
83825d0
Convert imports and usage from rose. to metomi.rose.
astroDimitrios Aug 2, 2024
e54fe36
Convert missed files to gtk3 and add gtk rose dir.
astroDimitrios Aug 2, 2024
8aec77c
Adds image resources for the gui.
astroDimitrios Aug 5, 2024
5858759
Updates Pango parse_markup and underline usage
astroDimitrios Aug 7, 2024
df1b1dc
Fixes function calls to GTK3 versions.
astroDimitrios Aug 7, 2024
4684b9a
Python 2 to 3 fixes
astroDimitrios Aug 19, 2024
2685a37
Updates scrollbar code.
astroDimitrios Aug 7, 2024
6bfa30d
Fixes Icons for buttons, windows and Icon IDs
astroDimitrios Aug 7, 2024
58a5f98
Fixes the Rose Gui splash screen
astroDimitrios Aug 8, 2024
9a33c93
Gtk.VBox changed to GtkBox(...VERTICAL), Gtk.HBox changed to GtkBox(.…
J-J-Abram Aug 12, 2024
7d7b105
Removes hard coded styling and replaces with css
astroDimitrios Aug 12, 2024
e9b699a
Fixes widget size related calls
astroDimitrios Aug 12, 2024
15ef07f
Fixes pack_start calls
astroDimitrios Aug 14, 2024
4503499
Removes Gtk.Arrow usage
astroDimitrios Aug 13, 2024
933a585
Fixes focussing issues on links and widgets
astroDimitrios Aug 14, 2024
43f8c43
Fixes log level for plain text messages
astroDimitrios Aug 14, 2024
f712557
Imports submodules in the valuewidget array __init__ file
astroDimitrios Aug 14, 2024
ef5b973
Fixes the maths in the array widget calculating the row for multirow …
astroDimitrios Aug 14, 2024
2b131ce
Removes Clyc related code
J-J-Abram Aug 14, 2024
57a77bd
Fixes credit/about dialog
astroDimitrios Aug 19, 2024
8b6c488
Fixes sort calls removing cmp usage
astroDimitrios Aug 27, 2024
555b394
Fixes macro button and submenu
astroDimitrios Aug 27, 2024
9890fa8
Fix to deal with comparison of NoneTypes and strings
astroDimitrios Aug 27, 2024
0c8a1ad
Removing all references to pygtk (#41)
J-J-Abram Sep 25, 2024
e558faa
Fixes popup() calls to GTK3 equivalents
J-J-Abram Sep 10, 2024
6849005
Fixes to the UM stash panel
astroDimitrios Sep 23, 2024
2529332
Update importlib code when importing custom widgets in resource.py
astroDimitrios Sep 23, 2024
fc7a0b6
Change search box from an Entry to a SearchEntry box and add default …
astroDimitrios Sep 24, 2024
ec3a11e
Add pygobject as a rose-edit dependency for install (#35)
astroDimitrios Sep 25, 2024
760ec70
Re-enable plotting of Metadata graphs
astroDimitrios Oct 17, 2024
1fb0219
Tutorial username file updated to GTK3 and Python3 (#45)
J-J-Abram Oct 3, 2024
48b8158
Update setter functions to fix python list formatting (#46)
J-J-Abram Oct 17, 2024
a2bd3da
Black formats the gui code and limits line length
astroDimitrios Oct 22, 2024
3ef6e8d
Fixes MyPy error in data.py where the exc variable was being overwritten
astroDimitrios Nov 27, 2024
b7b6f00
Updates the test workflow to install the required dependencies for ro…
astroDimitrios Nov 27, 2024
a7ce70a
Removes references in the README and the docs to no GUI being availab…
astroDimitrios Oct 29, 2024
924d306
Prevents the launch-splash-screen internal cli being shown when using…
astroDimitrios Dec 10, 2024
d520f04
Fixes file chooser widget import
astroDimitrios Jan 14, 2025
61ae825
Fixes multiline text box usage of Gtk.TextBuffer.get_text()
astroDimitrios Jan 14, 2025
3704bd5
Fixes repeat real array bug where numbers were turned into strings
astroDimitrios Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ jobs:
coreutils \
gnu-sed \
sqlite3 \
subversion
subversion \
gtk+3 \
gobject-introspection \
adwaita-icon-theme

# add GNU coreutils and sed to the user PATH (for actions steps)
# (see instructions in brew install output)
Expand All @@ -139,12 +142,12 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get update
sudo apt-get install -y shellcheck sqlite3 at graphviz graphviz-dev
sudo apt-get install -y shellcheck sqlite3 at graphviz graphviz-dev libgirepository1.0-dev python3-gi libgtk-3-dev gobject-introspection gir1.2-gtk-3.0

- name: Install Rose
working-directory: rose
run: |
pip install ."[tests,docs${{ (startsWith(matrix.os, 'ubuntu') && ',graph,rosa') || '' }}]"
pip install ."[tests,docs,rose-edit${{ (startsWith(matrix.os, 'ubuntu') && ',graph,rosa') || '' }}]"
yarn install

- name: Install Cylc
Expand Down Expand Up @@ -244,11 +247,11 @@ jobs:
- name: install graphviz
run: |
sudo apt-get update
sudo apt-get install -y graphviz pkg-config libgraphviz-dev
sudo apt-get install -y graphviz pkg-config libgraphviz-dev libgirepository1.0-dev python3-gi libgtk-3-dev gobject-introspection gir1.2-gtk-3.0

- name: Install Rose
run: |
pip install -e .[docs,graph]
pip install -e .[docs,graph,rose-edit]

- name: Install Cylc
uses: cylc/release-actions/install-cylc-components@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ etc/opt
doc
venv
metomi_rose.egg-info
build
dist
node_modules

Expand Down
18 changes: 9 additions & 9 deletions ACKNOWLEDGEMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Licences for non-Rose works included in this distribution can be
found in the licences/ directory.

etc/images/rose-icon.png,
etc/images/rose-icon.svg,
etc/images/rose-icon-trim.png,
etc/images/rose-icon-trim.svg,
etc/images/rose-logo.png,
etc/images/rosie-icon.png,
etc/images/rosie-icon.svg,
etc/images/rosie-icon-trim.png,
etc/images/rosie-icon-trim.svg,
metomi/rose/etc/images/rose-icon.png,
metomi/rose/etc/images/rose-icon.svg,
metomi/rose/etc/images/rose-icon-trim.png,
metomi/rose/etc/images/rose-icon-trim.svg,
metomi/rose/etc/images/rose-logo.png,
metomi/rose/etc/images/rosie-icon.png,
metomi/rose/etc/images/rosie-icon.svg,
metomi/rose/etc/images/rosie-icon-trim.png,
metomi/rose/etc/images/rosie-icon-trim.svg,
metomi/rose/etc/rose-all/etc/images/icon.png,
metomi/rose/etc/rose-meta/rose-all/etc/images/icon.png
* These icons are all derived from the public domain image at
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Rose: a framework for managing and running meteorological suites.
#### Rose 2

- Python 3
- No GUIs
- PyGObject GUI
- Web-based GUIs will follow in later Rose 2 releases
- `master` branch in the source code

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ values=1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21
description=A variable with 5 values (& value-titles) using radiobuttons
value-titles=A title, B title, C title, D title, E title
values='a', 'b', 'c', 'd', 'e'
widget[rose-config-edit]=rose.config_editor.valuewidget.radiobuttons.RadioButtonsValueWidget
widget[rose-config-edit]=metomi.rose.config_editor.valuewidget.radiobuttons.RadioButtonsValueWidget

[namelist:nl2]
duplicate=true
Expand All @@ -194,7 +194,7 @@ values=4

[namelist:table_nl]
description=A page containing a custom table layout
widget[rose-config-edit]=rose.config_editor.pagewidget.table.PageArrayTable
widget[rose-config-edit]=metomi.rose.config_editor.pagewidget.table.PageArrayTable

[namelist:table_nl=my_boolean_array]
description=A boolean array of length 5
Expand Down
Loading
Loading