Skip to content

Update runtime to GNOME 42 #7

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

Merged
merged 1 commit into from
Sep 23, 2022
Merged

Conversation

starnight
Copy link
Contributor

@starnight starnight commented Sep 22, 2022

  • Update the runtime to GNOME 42

  • Split the Python dependencies to python3-requirements.json which is generated by command 1: "python3 flatpak-pip-generator --requirements-file=requirements.txt"

    Have the dependent Python libraries in the requirements.txt:
    dbus-python==1.2.18
    decorator
    numpy

  • Bump turtleart-activity to commit 1a9037ad613e ("Fix the build error from the wrong option to setuptools") which upgrades to Python3, GTK3 and more fixes.

@flathubbot
Copy link

Started test build 111615

@flathubbot
Copy link

Build 111615 failed

@wjt
Copy link
Member

wjt commented Sep 22, 2022

#5 contained this commit 590b05c which added numpy to fix an error observed in this comment #5 (comment)

@@ -1,7 +1,7 @@
{
"app-id": "org.laptop.TurtleArtActivity",
"runtime": "org.gnome.Platform",
"runtime-version": "3.34",
"runtime-version": "42",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

43 is likely to be released in the next few hours!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Err ...

@flathubbot
Copy link

Started test build 111619

@flathubbot
Copy link

Build 111619 failed

@flathubbot
Copy link

Started test build 111621

@flathubbot
Copy link

Build 111621 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/109230/org.laptop.TurtleArtActivity.flatpakref

@wjt
Copy link
Member

wjt commented Sep 22, 2022

If you open the Plugins menu, enable all plugins, and restart, you'll see:

Failed to load Audio_sensors: No module named 'numpy'

So we do need 'numpy'

@wjt
Copy link
Member

wjt commented Sep 22, 2022

The upstream regression mentioned at #5 (comment) is still present:

Traceback (most recent call last):
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 1241, in _buttonpress_cb
    self.button_press(
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 1311, in button_press
    elif self._check_for_anything_else(spr, x, y):
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 1624, in _check_for_anything_else
    self._select_category(spr)
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 1794, in _select_category
    self.show_palette(i)
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 987, in show_palette
    self.show_toolbar_palette(n)
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 1097, in show_toolbar_palette
    self.palette_views[n].create(regenerate=regenerate, show=show)
  File "/app/lib/python3.9/site-packages/TurtleArt/tapaletteview.py", line 64, in create
    self._create_proto_blocks()
  File "/app/lib/python3.9/site-packages/TurtleArt/tapaletteview.py", line 198, in _create_proto_blocks
    self._proto_skin(name + 'small', self.blocks[-1].spr)
  File "/app/lib/python3.9/site-packages/TurtleArt/tapaletteview.py", line 211, in _proto_skin
    x, y = self._turtle_window.calc_image_offset(name, spr)
  File "/app/lib/python3.9/site-packages/TurtleArt/tawindow.py", line 4863, in calc_image_offset
    iw = self.media_shapes[name].get_width()
KeyError: 'camera1small'

but to me this is not reason enough to not update the app.

@flathubbot
Copy link

Started test build 111774

@starnight
Copy link
Contributor Author

starnight commented Sep 23, 2022

If you open the Plugins menu, enable all plugins, and restart, you'll see:

Failed to load Audio_sensors: No module named 'numpy'

So we do need 'numpy'

Sure! Updated to the fixed commit.

@flathubbot
Copy link

Build 111774 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/109380/org.laptop.TurtleArtActivity.flatpakref

@starnight starnight requested a review from wjt September 23, 2022 06:39
* Update the runtime to GNOME 42

* Split the Python dependencies to python3-requirements.json which is
  generated by command [1]:
    "python3 flatpak-pip-generator --requirements-file=requirements.txt"

  Have the dependent Python libraries in the requirements.txt:
    dbus-python==1.2.18
    decorator
    numpy

* Bump turtleart-activity to commit 1a9037ad613e ("Fix the build error
  from the wrong option to setuptools") which upgrades to Python3, GTK3
  and more fixes.

[1]: https://docs.flatpak.org/en/latest/python.html#building-multiple-python-dependencies
@flathubbot
Copy link

Started test build 111799

@starnight starnight requested a review from wjt September 23, 2022 09:48
@flathubbot
Copy link

Build 111799 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/109406/org.laptop.TurtleArtActivity.flatpakref

Copy link
Member

@wjt wjt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Sadly I cannot press merge.

@wjt
Copy link
Member

wjt commented Sep 23, 2022

@tchx84 do you have the power? Any further feedback here?

@tchx84 tchx84 merged commit 716380d into flathub:master Sep 23, 2022
@tchx84
Copy link
Collaborator

tchx84 commented Sep 23, 2022

@wjt done!

@starnight starnight deleted the upgrade-to-gnome42 branch September 23, 2022 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants