merged

Author: fpgmaas

.github/workflows/pytest.yaml

@@ -58,6 +58,16 @@ jobs:
           make test
 
       - name: Type check with pyright
+        if: steps.install.outcome == 'success' && (success() || failure())
+        run: |
+          make pyright
+
+      - name: Lint with flake8
+        if: steps.install.outcome == 'success' && (success() || failure())
+        run: |
+          make lint
+
+      - name: black and isort
         if: steps.install.outcome == 'success' && (success() || failure())
         run: |
           make check
@@ -69,11 +79,6 @@ jobs:
         run: |
           cd docs && make html
 
-      - name: Lint with flake8
-        if: steps.install.outcome == 'success' && (success() || failure())
-        run: |
-          make lint
-
       - name: Run e2e tests
         if: steps.install.outcome == 'success' && (success() || failure())
         run: |

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
-  - repo: https://github.com/ambv/black
-    rev: 22.3.0
+  - repo: https://github.com/psf/black
+    rev: "22.8.0"
     hooks:
       - id: black
         language_version: python3

CHANGELOG.md

@@ -5,16 +5,13 @@ All notable changes to Shiny for Python will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [UNRELEASED]
-
-### New features
-
+## [0.2.8] - 2022-10-20
 
 ### Bug fixes
 
 * `panel_conditional` now works correctly inside of Shiny modules. (Thanks, @gcaligari!) (#336)
 
-### Other changes
+* Fix compatibility with Uvicorn 0.19.0 (#357)
 
 
 ## [0.2.7] - 2022-09-27

Makefile

@@ -51,14 +51,24 @@ clean-test: ## remove test and coverage artifacts
 typings/uvicorn/__init__.pyi:
 	pyright --createstub uvicorn
 
-check: typings/uvicorn/__init__.pyi ## type check with pyright
+pyright: typings/uvicorn/__init__.pyi ## type check with pyright
 	pyright
 
-check-old: typings/uvicorn/__init__.pyi ## type check with pyright
-	pyright --pythonversion=3.7
-
 lint: ## check style with flake8
-	flake8 --show-source --max-line-length=127 shiny tests examples
+	echo "Checking style with flake8."
+	flake8 --show-source .
+
+format: ## format code with black and isort
+	echo "Formatting code with black."
+	black .
+	echo "Sorting imports with isort."
+	isort .
+
+check: pyright lint ## check code quality with pyright, flake8, black and isort
+	echo "Checking code with black."
+	black --check .
+	echo "Sorting imports with isort."
+	isort --check-only --diff .
 
 test: ## run tests quickly with the default Python
 	python3 tests/asyncio_prevent.py

docs/sphinxext/pyshinyapp.py

@@ -18,14 +18,14 @@
 """
 
 import os
-from os.path import dirname, join, abspath
 import shutil
+from os.path import abspath, dirname, join
 
-from docutils.nodes import SkipNode, Element
+from docutils.nodes import Element, SkipNode
 from docutils.parsers.rst import directives
+from htmltools import css
 from sphinx.application import Sphinx
 from sphinx.util.docutils import SphinxDirective
-from htmltools import css
 
 # Local path to the shinylive/ directory (currently provided by rstudio/shinylive)
 # This is only needed for the "self-contained" version of the API reference.

e2e/async/app.py

@@ -3,7 +3,7 @@
 import time
 
 import shiny as s
-from shiny import ui, reactive
+from shiny import reactive, ui
 
 
 def calc(value: str) -> str:

e2e/async/test_async.py

@@ -1,8 +1,8 @@
 # See https://github.com/microsoft/playwright-python/issues/1532
 # pyright: reportUnknownMemberType=false
 
-from playwright.sync_api import Page, expect
 from conftest import ShinyAppProc
+from playwright.sync_api import Page, expect
 
 
 def test_async_app(page: Page, local_app: ShinyAppProc) -> None:

e2e/controls.py

@@ -2,7 +2,7 @@
 
 # pyright: reportUnknownMemberType=false
 
-from playwright.sync_api import Page, expect, Locator
+from playwright.sync_api import Locator, Page, expect
 
 
 class SimpleInput:

e2e/cpuinfo/test_app.py

@@ -1,8 +1,9 @@
 # pyright: reportUnknownMemberType=false
 
 import re
-from playwright.sync_api import Page, expect
+
 from conftest import ShinyAppProc, create_example_fixture
+from playwright.sync_api import Page, expect
 
 cpuinfo_app = create_example_fixture("cpuinfo")
 

e2e/input_numeric/test_input_numeric.py

@@ -1,9 +1,9 @@
 # See https://github.com/microsoft/playwright-python/issues/1532
 # pyright: reportUnknownMemberType=false
 
-from playwright.sync_api import Page, expect
-from conftest import ShinyAppProc, create_doc_example_fixture
 import controls
+from conftest import ShinyAppProc, create_doc_example_fixture
+from playwright.sync_api import Page, expect
 
 app = create_doc_example_fixture("input_numeric")