Merge pull request #163 from davidbrochart/py3.7

Support python 3.7

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [ 3.9 ]
+        python-version: [ '3.7', '3.8', '3.9', '3.10' ]
 
     steps:
     - name: Checkout
@@ -45,7 +45,7 @@ jobs:
         pip install ./plugins/yjs
         pip install ./plugins/lab
         pip install ./plugins/jupyterlab
-        
+
         pip install flake8 black mypy pytest pytest-asyncio requests ipykernel
 
     - name: Check style

plugins/auth/README.md

@@ -0,0 +1,3 @@
+# fps-auth
+
+An FPS plugin for the authentication API.

plugins/auth/fps_auth/config.py

@@ -1,5 +1,5 @@
 from uuid import uuid4
-from typing import Literal, Optional
+from typing import Optional
 from pydantic import SecretStr
 
 from fps.config import PluginModel, get_config  # type: ignore
@@ -10,7 +10,8 @@ class AuthConfig(PluginModel):
     client_id: str = ""
     client_secret: SecretStr = SecretStr("")
     redirect_uri: str = ""
-    mode: Literal["noauth", "token", "user"] = "token"
+    # mode: Literal["noauth", "token", "user"] = "token"
+    mode: str = "token"
     token: str = str(uuid4())
     collaborative: bool = False
     global_email: str = "[email protected]"

plugins/auth/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_auth
 version = attr: fps_auth.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/contents/README.md

@@ -0,0 +1,3 @@
+# fps-contents
+
+An FPS plugin for the contents API.

plugins/contents/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_contents
 version = attr: fps_contents.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/jupyterlab/README.md

@@ -0,0 +1,3 @@
+# fps-jupyterlab
+
+An FPS plugin for the JupyterLab API.

plugins/jupyterlab/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_jupyterlab
 version = attr: fps_jupyterlab.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/kernels/README.md

@@ -0,0 +1,3 @@
+# fps-kernels
+
+An FPS plugin for the kernels API.

plugins/kernels/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_kernels
 version = attr: fps_kernels.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/lab/README.md

@@ -0,0 +1,3 @@
+# fps-lab
+
+An FPS plugin for the JupyterLab/RetroLab API.

plugins/lab/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_lab
 version = attr: fps_lab.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/login/README.md

@@ -0,0 +1,3 @@
+# fps-login
+
+An FPS plugin for the login API.

plugins/login/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_login
 version = attr: fps_login.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/nbconvert/README.md

@@ -0,0 +1,3 @@
+# fps-nbconvert
+
+An FPS plugin for the nbconvert API.

plugins/nbconvert/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_nbconvert
 version = attr: fps_nbconvert.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/retrolab/README.md

@@ -0,0 +1,3 @@
+# fps-retrolab
+
+An FPS plugin for the RetroLab API.

plugins/retrolab/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_retrolab
 version = attr: fps_retrolab.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/terminals/README.md

@@ -0,0 +1,3 @@
+# fps-terminals
+
+An FPS plugin for the terminals API.

plugins/terminals/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_terminals
 version = attr: fps_terminals.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

plugins/yjs/README.md

@@ -0,0 +1,3 @@
+# fps-yjs
+
+An FPS plugin for the Yjs API.

plugins/yjs/setup.cfg

@@ -1,6 +1,8 @@
 [metadata]
 name = fps_yjs
 version = attr: fps_yjs.__version__
+long_description = file: README.md
+long_description_content_type = text/markdown
 
 [options]
 include_package_data = True

setup.cfg

@@ -51,3 +51,6 @@ console_scripts =
 
 [flake8]
 max-line-length = 100
+
+[tool:pytest]
+asyncio_mode = strict

tests/test_kernels.py

@@ -1,4 +1,5 @@
 import os
+import sys
 from time import sleep
 
 import pytest
@@ -7,6 +8,10 @@
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("auth_mode", ("noauth",))
+@pytest.mark.skipif(
+    sys.platform.startswith("win") and sys.version_info < (3, 8),
+    reason="ipykernel not supported",
+)
 async def test_kernel_messages(client, capfd):
     kernel_id = "kernel_id_0"
     kernel_name = "python3"

tests/test_settings.py

@@ -1,10 +1,15 @@
 import json
+import sys
 
 import pytest
 from fastapi.testclient import TestClient
 
 
 @pytest.mark.parametrize("auth_mode", ("noauth",))
+@pytest.mark.skipif(
+    sys.platform.startswith("linux") and sys.version_info < (3, 8),
+    reason="pytest-asyncio issue",
+)
 def test_settings(client, app):
     with TestClient(app) as client:
         # get previous theme