From 6939a0a17a5c4c202dc2bce7a38134db616e6881 Mon Sep 17 00:00:00 2001 From: Deb NIcholson Date: Sat, 22 Jul 2023 10:58:32 -0400 Subject: [PATCH 1/3] change VERSION to LINUXDEPLOY_OUTPUT_VERSION --- src/briefcase/platforms/linux/appimage.py | 2 +- tests/platforms/linux/appimage/test_build.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/briefcase/platforms/linux/appimage.py b/src/briefcase/platforms/linux/appimage.py index f9916a5f4..5af145b2e 100644 --- a/src/briefcase/platforms/linux/appimage.py +++ b/src/briefcase/platforms/linux/appimage.py @@ -258,7 +258,7 @@ def build_app(self, app: AppConfig, **kwargs): # pragma: no-cover-if-is-windows try: # For some reason, the version has to be passed in as an # environment variable, *not* in the configuration. - env["VERSION"] = app.version + env["LINUXDEPLOY_OUTPUT_VERSION"] = app.version # The internals of the binary aren't inherently visible, so # there's no need to package copyright files. These files # appear to be missing by default in the OS dev packages anyway, diff --git a/tests/platforms/linux/appimage/test_build.py b/tests/platforms/linux/appimage/test_build.py index c2d78db55..617cf9f07 100644 --- a/tests/platforms/linux/appimage/test_build.py +++ b/tests/platforms/linux/appimage/test_build.py @@ -186,7 +186,7 @@ def test_build_appimage(build_command, first_app, tmp_path, sub_stream_kw): ], env={ "PATH": "/usr/local/bin:/usr/bin:/path/to/somewhere", - "VERSION": "0.0.1", + "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1", "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1", "APPIMAGE_EXTRACT_AND_RUN": "1", "ARCH": "wonky", @@ -276,7 +276,7 @@ def test_build_appimage_with_plugin(build_command, first_app, tmp_path, sub_stre env={ "PATH": f"{gtk_plugin_path.parent}:{app_dir.parent}:/usr/local/bin:/usr/bin:/path/to/somewhere", "DEPLOY_GTK_VERSION": "3", - "VERSION": "0.0.1", + "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1", "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1", "APPIMAGE_EXTRACT_AND_RUN": "1", "ARCH": "wonky", @@ -353,7 +353,7 @@ def test_build_failure(build_command, first_app, tmp_path, sub_stream_kw): ], env={ "PATH": "/usr/local/bin:/usr/bin:/path/to/somewhere", - "VERSION": "0.0.1", + "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1", "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1", "APPIMAGE_EXTRACT_AND_RUN": "1", "ARCH": "wonky", @@ -416,7 +416,7 @@ def test_build_appimage_in_docker(build_command, first_app, tmp_path, sub_stream "--volume", f"{build_command.data_path}:/home/brutus/.cache/briefcase:z", "--env", - "VERSION=0.0.1", + "LINUXDEPLOY_OUTPUT_VERSION=0.0.1", "--env", "DISABLE_COPYRIGHT_FILES_DEPLOYMENT=1", "--env", @@ -540,7 +540,7 @@ def test_build_appimage_with_plugins_in_docker( ":/app:/docker/bin:/docker/sbin" ), "--env", - "VERSION=0.0.1", + "LINUXDEPLOY_OUTPUT_VERSION=0.0.1", "--env", "DISABLE_COPYRIGHT_FILES_DEPLOYMENT=1", "--env", @@ -671,7 +671,7 @@ def test_build_appimage_with_support_package_update( ], env={ "PATH": "/usr/local/bin:/usr/bin:/path/to/somewhere", - "VERSION": "0.0.1", + "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1", "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1", "APPIMAGE_EXTRACT_AND_RUN": "1", "ARCH": "wonky", From c0f4348a3ad6be59ef98ab66e27e3969cdc36af8 Mon Sep 17 00:00:00 2001 From: Deb NIcholson Date: Sat, 22 Jul 2023 11:04:03 -0400 Subject: [PATCH 2/3] add a change note --- changes/1361.bugfix.rst | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/1361.bugfix.rst diff --git a/changes/1361.bugfix.rst b/changes/1361.bugfix.rst new file mode 100644 index 000000000..047eeba0a --- /dev/null +++ b/changes/1361.bugfix.rst @@ -0,0 +1,4 @@ +Appimages builds now use ``LINUXDEPLOY_OUTPUT_VERSION`` rather than ``VERSION`` to inject the version number. + + + From 2d0e3518dab827474c4a010602a419d6a1a83e92 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 22 Jul 2023 17:49:34 +0200 Subject: [PATCH 3/3] Cleanup pre-commit issues. --- changes/1361.bugfix.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/changes/1361.bugfix.rst b/changes/1361.bugfix.rst index 047eeba0a..168ebb784 100644 --- a/changes/1361.bugfix.rst +++ b/changes/1361.bugfix.rst @@ -1,4 +1 @@ -Appimages builds now use ``LINUXDEPLOY_OUTPUT_VERSION`` rather than ``VERSION`` to inject the version number. - - - +Appimages builds now use ``LINUXDEPLOY_OUTPUT_VERSION`` rather than ``VERSION`` to inject the version number.