Merge pull request #20 from vaaaaanquish/xonsh-0925

$PTK_STYLE_OVERRIDES is deprecated
vaaaaanquish · Jan 29, 2021 · 7352acd · 7352acd
2 parents 56fbb1a + ba69f9c
commit 7352acd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -144,3 +144,8 @@ xontrib load powerline2
 
  - `laerus/cookiecutter-xontrib`: https://github.com/laerus/cookiecutter-xontrib
  - `santagada/xontrib-powerline`: https://github.com/santagada/xontrib-powerline
+
+# Similer Projects
+
+ - `jnoortheen/xontrib-powerline3`: https://github.com/jnoortheen/xontrib-powerline3
+ - That is also compatible with `ASYNC_PROMPT`!
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
  name='xontrib-powerline2',
- version='1.3.0',
+ version='1.4.0',
  description='Powerline for Xonsh shell',
  long_description=open('README.md').read(),
  long_description_content_type="text/markdown",

diff --git a/xontrib/powerline2.xsh b/xontrib/powerline2.xsh
@@ -41,7 +41,12 @@ $PL_DEFAULT_COLORS = {
  }
 
 if ptk2:
- $PTK_STYLE_OVERRIDES['bottom-toolbar'] = 'noreverse'
+ # $PTK_STYLE_OVERRIDES is deprecated
+ # https://github.com/vaaaaanquish/xontrib-powerline2/issues/19
+ if version.parse(xonsh.__version__) < version.parse("0.9.24"):
+ $PTK_STYLE_OVERRIDES['bottom-toolbar'] = 'noreverse'
+ else:
+ $XONSH_STYLE_OVERRIDES['bottom-toolbar'] = 'noreverse'
 
 modes = {
  'powerline': '\ue0b0\ue0b1\ue0b2\ue0b3',