Skip to content

Replace sugar3 references with sugar4 #9

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.

Sign up for GitHub

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

Open
chimosky wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Replace sugar3 references with sugar4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b3ff17
Replace sugar3 references with sugar4
chimosky Jan 21, 2026
05fe3d2
fix: missing closing `'''` added
MostlyKIGuess Jan 22, 2026
52f0051
Revert changes to MenuItem.
chimosky Jan 22, 2026
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ help:
@echo 'Targets:'
@awk 'BEGIN {FS = ":.*##"} /^[a-zA-Z_-]+:.*##/ {printf " %-15s %s\n", $$1, $$2}' $(MAKEFILE_LIST)

install: ## Install package in development mode
pip install -e .
install: ## Install package
pip install --root-user-action=ignore .
Copy link
Member

@MostlyKIGuess MostlyKIGuess Jan 22, 2026

Choose a reason for hiding this comment

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

Could you explain this? We would prefer development mode for testing right?

Copy link
Member Author

@chimosky chimosky Jan 22, 2026

Choose a reason for hiding this comment

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

I'm running this in the live build, and I needed that.

Anyone running in the live build would too.

I haven't tested most of my changes because there's still much that needs to be done to get it to the point where you can see your changes, I've been moving forward by fixing build errors.

Copy link
Member

@MostlyKIGuess MostlyKIGuess Jan 22, 2026

Choose a reason for hiding this comment

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

We can perhaps have make install-live-build?

Copy link
Member Author

@chimosky chimosky Jan 22, 2026

Choose a reason for hiding this comment

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

That can work.


test: ## Run all tests
pytest tests/ -v
Expand Down
2 changes: 1 addition & 1 deletion bin/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dist_bin_SCRIPTS = sugar-activity sugar-activity-web sugar-activity3
dist_bin_SCRIPTS = sugar-activity sugar-activity-web sugar-activity4
2 changes: 1 addition & 1 deletion bin/sugar-activity
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python2

from sugar3.activity import activityinstance
from sugar4.activity import activityinstance

activityinstance.main()
2 changes: 1 addition & 1 deletion bin/sugar-activity-web
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.

exec sugar-activity3 sugar3.activity.webactivity.WebActivity $@
exec sugar-activity3 sugar4.activity.webactivity.WebActivity $@
2 changes: 1 addition & 1 deletion bin/sugar-activity3 → bin/sugar-activity4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env python3

from sugar3.activity import activityinstance
from sugar4.activity import activityinstance

activityinstance.main()
2 changes: 1 addition & 1 deletion ci/docs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sudo make
show-green "Building documentation"
./make-doc.sh
mkdir deploy
cp -r doc/_build/html deploy/sugar3
cp -r doc/_build/html deploy/sugar4
touch deploy/.nojekyll
# create an index.html so that users don't become confused
show-green "Writing index.html"
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"dbus",
"SimpleHTTPServer",
"socketserver",
"sugar3",
"sugar4",
"cairo",
]

Expand Down
16 changes: 8 additions & 8 deletions po/POTFILES.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
src/sugar3/activity/activity.py
src/sugar3/activity/widgets.py
src/sugar3/graphics/alert.py
src/sugar3/graphics/colorbutton.py
src/sugar3/graphics/objectchooser.py
src/sugar3/util.py
src/sugar3/mime.py
src/sugar3/speech.py
src/sugar4/activity/activity.py
src/sugar4/activity/widgets.py
src/sugar4/graphics/alert.py
src/sugar4/graphics/colorbutton.py
src/sugar4/graphics/objectchooser.py
src/sugar4/util.py
src/sugar4/mime.py
src/sugar4/speech.py
6 changes: 3 additions & 3 deletions po/POTFILES.skip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# We don't care about these string, they are in code which we don't really
# use and is there solely to not diverge too much from the "upstream"
# versions of these files.
src/sugar3/eggdesktopfile.c
src/sugar3/eggsmclient.c
src/sugar3/gsm-xsmp.c
src/sugar4/eggdesktopfile.c
src/sugar4/eggsmclient.c
src/sugar4/gsm-xsmp.c
tests/data/sample.activity/activity.py
Loading