Skip to content

Commit

Permalink
Remove XXL bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
aivarannamaa committed Jun 15, 2024
1 parent 8c751b8 commit 71cf03b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 58 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
Version history
===============

5.0.0b1 (2024-06-??)
====================
Breaking changes
----------------
* Minimal supported Python version is now 3.9
* Drop support for Windows 7 and 8.
* Stop publishing binaries for Linux, #3210. The Linux installation script now creates a private venv (based on system python3) for Thonny even in x84_64.
* Stop publishing XXL bundle as it is not trivial to prepare bundles for all popular architectures while making sure there are no version conflicts between the large number of packages. For teachers who relied on the XXL bundle, the work-around is to prepare a suitable requirements.txt, which can be used as input in Thonny's package manager.


4.1.4 (2023-11-19)
==================
* Fix regression in MicroPython package installation, #2979
Expand Down
2 changes: 1 addition & 1 deletion packaging/linux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Clone the [Flatpak Builder Tools](https://github.com/flatpak/flatpak-builder-too
git clone https://github.com/flatpak/flatpak-builder-tools.git

Now run the Flatpak Pip Generator script for the necessary packages.
The necessary packages are listed in the files `packaging/requirements-regular-bundle.txt` and `packaging/requirements-xxl-bundle.txt` in Thonny's repository.
The necessary packages are listed in the files `packaging/requirements-regular-bundle.txt` in Thonny's repository.
The following command shows how to retrieve packages from Thonny's `requirements.txt` file by producing a `python3-modules.json` file.
I usually convert these to YAML and place them directly in the Flatpak manifest for readability.

Expand Down
21 changes: 0 additions & 21 deletions packaging/linux/create_tarball.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ $TARGET_DIR/bin/python3.10 -s -m pip install --pre --no-cache-dir thonny
VERSION=$(<$TARGET_DIR/lib/python3.10/site-packages/thonny/VERSION)
ARCHITECTURE="$(uname -m)"
VERSION_NAME=thonny-$VERSION-$ARCHITECTURE
XXL_VERSION_NAME=thonny-xxl-$VERSION-$ARCHITECTURE


# clean up unnecessary stuff
Expand Down Expand Up @@ -127,19 +126,7 @@ cp ../../*LICENSE.txt $TARGET_DIR
mkdir -p dist
tar -cvzf dist/${VERSION_NAME}.tar.gz -C build thonny

# XXL ###########################################################

# $TARGET_DIR/bin/python3.10 -s -m pip install --no-cache-dir -r ../requirements-xxl-bundle.txt
#
# find $TARGET_DIR -type f -name "*.pyo" -delete
# find $TARGET_DIR -type f -name "*.pyc" -delete
#
# mkdir -p dist
# tar -cvzf dist/$XXL_VERSION_NAME.tar.gz -C build thonny
#
#
# create download + install script
# normal
DOWNINSTALL_FILENAME=thonny-${VERSION}.bash
DOWNINSTALL_TARGET=dist/$DOWNINSTALL_FILENAME
cp downinstall_template.sh $DOWNINSTALL_TARGET
Expand All @@ -148,11 +135,3 @@ sed -i "s/_VARIANT_/thonny/g" $DOWNINSTALL_TARGET
#sed -i "s/_DEPS_/$(tr '\n' ' ' < ../requirements-regular-bundle.txt)/g" $DOWNINSTALL_TARGET
./insert_deps.py ../requirements-regular-bundle.txt $DOWNINSTALL_TARGET

# xxl
#XXL_DOWNINSTALL_FILENAME=thonny-xxl-$VERSION.bash
#XXL_DOWNINSTALL_TARGET=dist/$XXL_DOWNINSTALL_FILENAME
#cp downinstall_template.sh $XXL_DOWNINSTALL_TARGET
#sed -i "s/_VERSION_/$VERSION/g" $XXL_DOWNINSTALL_TARGET
#sed -i "s/_VARIANT_/thonny-xxl/g" $XXL_DOWNINSTALL_TARGET
#sed -i "s/_DEPS_/$(tr '\n' ' ' < ../requirements-xxl-bundle.txt)/g" $XXL_DOWNINSTALL_TARGET

13 changes: 0 additions & 13 deletions packaging/mac/create_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,6 @@ echo "--- Creating installer -------------------------------------"
./create_installer_from_build.sh "thonny" "Thonny" $thonny_version

echo
#echo "### Creating XXL installer ###################################################"
#./prepare_dist_bundle.sh $thonny_version ../requirements-regular-bundle.txt ../requirements-xxl-bundle.txt
#./sign_bundle_in_build.sh
#./create_installer_from_build.sh "thonny-xxl" "Thonny XXL" $thonny_version

#echo
#echo "### Creating portable DMG ####################################################"
#./prepare_dist_bundle.sh $thonny_version ../requirements-regular-bundle.txt
#cp ../portable_thonny.ini build/Thonny.app/Contents/Frameworks/Python.framework/Versions/3.12/bin
#./sign_bundle_in_build.sh
#./create_portable_dmg_from_build.sh "thonny" $thonny_version


# clean up #######################################################################
#rm -rf build

1 change: 0 additions & 1 deletion packaging/mac/notarize_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set -e
thonny_version=$(<../../thonny/VERSION)

~/private/notarize-app.sh "dist/thonny-${thonny_version}.pkg"
#~/private/notarize-app.sh "dist/thonny-xxl-${thonny_version}.pkg"


# Notarizing #####################################################################
Expand Down
22 changes: 0 additions & 22 deletions packaging/requirements-xxl-bundle.txt

This file was deleted.

0 comments on commit 71cf03b

Please sign in to comment.