Skip to content

Commit

Permalink
Bump APPIMAGE_PYTHON_VERSION to 3.11 and fix xpip for AppImage (xonsh…
Browse files Browse the repository at this point in the history
  • Loading branch information
anki-code committed Jan 12, 2023
1 parent 1e6faa4 commit 81e3bdd
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
23 changes: 23 additions & 0 deletions news/appimage311.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**Added:**

* <news item>

**Changed:**

* xonsh AppImage - bumped python to 3.11

**Deprecated:**

* <news item>

**Removed:**

* <news item>

**Fixed:**

* Fixed xpip alias for xonsh AppImage.

**Security:**

* <news item>
2 changes: 1 addition & 1 deletion rever.xsh
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ $DOCKER_GIT_EMAIL = 'xonsh@googlegroups.com'

$GHRELEASE_ASSETS = [git_archive_asset, 'xonsh-x86_64.AppImage']

$APPIMAGE_PYTHON_VERSION = '3.10'
$APPIMAGE_PYTHON_VERSION = '3.11'
5 changes: 4 additions & 1 deletion xonsh/aliases.py
Original file line number Diff line number Diff line change
Expand Up @@ -812,9 +812,12 @@ def detect_xpip_alias():

basecmd = [sys.executable, "-m", "pip"]
try:
if ON_WINDOWS or IN_APPIMAGE:
if ON_WINDOWS:
# XXX: Does windows have an installation mode that requires UAC?
return basecmd
elif IN_APPIMAGE:
# In AppImage `sys.executable` is equal to path to xonsh.AppImage file and the real python executable is in $_
return [XSH.env.get("_", "APPIMAGE_PYTHON_EXECUTABLE_NOT_FOUND"), "-m", "pip"]
elif not os.access(os.path.dirname(sys.executable), os.W_OK):
return (
sys.executable
Expand Down

0 comments on commit 81e3bdd

Please sign in to comment.