bump to 0.6.10 (#461)

.github/workflows/main.yml

@@ -1,31 +1,31 @@
 name: Main
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   RADIAN_NO_INPUTHOOK: 1
 
 jobs:
-  cleanup:
-    name: Cancel Previous Runs
-    runs-on: ubuntu-latest
-    steps:
-      - uses: styfle/cancel-workflow-action@0.11.0
-        with:
-          access_token: ${{ github.token }}
-
   pytest:
     name: ${{ matrix.os }} r-${{ matrix.r }} py-${{ matrix.python }}
     strategy:
       fail-fast: false
       matrix:
         r: [4.1, latest, devel]
-        python: [3.8]
+        python: [3.8, 3.12]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
           python-version: ${{ matrix.python }}
@@ -36,7 +36,7 @@ jobs:
         run: Rscript -e "install.packages(c('reticulate', 'askpass'))"
       - name: Install and run tests
         run: |
-          python -m pip install jedi==0.17.2
+          python -m pip install jedi
           python -m pip install -e .[test]
           pytest -s --coverage
           coverage combine
@@ -57,11 +57,11 @@ jobs:
       TWINE_USERNAME: ${{secrets.TWINE_USERNAME}}
       TWINE_PASSWORD: ${{secrets.TWINE_PASSWORD}}
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-python@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         name: Install Python
         with:
-          python-version: 3.8
+          python-version: 3.11
       - run: python -m pip install twine
       - run: python setup.py sdist
       - run: python -m pip install dist/*

radian/__init__.py

@@ -1,5 +1,5 @@
 from .app import get_app, main
 
-__version__ = '0.6.9'
+__version__ = '0.6.10'
 
 __all__ = ["get_app", "main"]

radian/console.py

@@ -180,7 +180,9 @@ def write_console_ex(buf, otype):
                             if i < len(sbuf) - 1:
                                 output.write("\r")
                         output.flush()
-                        TERMINAL_CURSOR_AT_BEGINNING[0] = buf.endswith("\n")
+                        buf = normalize(buf)
+                        if buf:
+                            TERMINAL_CURSOR_AT_BEGINNING[0] = buf.endswith("\n")
                 else:
                     if not SUPPRESS_STDERR:
                         buf = buf.replace("\r\n", "\n")
@@ -191,19 +193,24 @@ def write_console_ex(buf, otype):
                             if i < len(sbuf) - 1:
                                 output.write("\r")
                         output.flush()
-                        TERMINAL_CURSOR_AT_BEGINNING[0] = normalize(buf).endswith("\n")
+                        buf = normalize(buf)
+                        if buf:
+                            TERMINAL_CURSOR_AT_BEGINNING[0] = buf.endswith("\n")
 
     if not write_console_ex:
         def write_console_ex(buf, otype):
+            buf = normalize(buf)
             if otype == 0:
                 if not SUPPRESS_STDOUT:
                     output.write_raw(buf)
                     output.flush()
-                    TERMINAL_CURSOR_AT_BEGINNING[0] = normalize(buf).endswith("\n")
+                    if buf:
+                        TERMINAL_CURSOR_AT_BEGINNING[0] = buf.endswith("\n")
             else:
                 if not SUPPRESS_STDERR:
                     output.write_raw(stderr_format.format(buf))
                     output.flush()
-                    TERMINAL_CURSOR_AT_BEGINNING[0] = normalize(buf).endswith("\n")
+                    if buf:
+                        TERMINAL_CURSOR_AT_BEGINNING[0] = buf.endswith("\n")
 
     return write_console_ex

setup.py

@@ -26,7 +26,7 @@ def get_version(package):
     "pytest",
     "pyte>=0.8.0",
     "pexpect",
-    "pywinpty==0.5.7" if sys.platform.startswith("win") else "ptyprocess"
+    "pywinpty" if sys.platform.startswith("win") else "ptyprocess"
 ]
 
 
@@ -40,10 +40,10 @@ def get_version(package):
     long_description_content_type="text/markdown",
     packages=find_packages('.', exclude=["tests"]),
     package_data={'radian': ['reticulate/*.R']},
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     install_requires=[
         # 'rchitect@git+https://github.com/randy3k/rchitect',
-        'rchitect>=0.4.3,<0.5.0',
+        'rchitect>=0.4.6,<0.5.0',
         'prompt_toolkit>=3.0.41,<3.1',
         'pygments>=2.5.0'
     ],