Merge pull request #4 from SciCatProject/merge-sjng

More notebook formatting and dynamic config

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
           submodules: true
       - uses: actions/setup-python@v3
         with:
-          python-version: 3.8
+          python-version: 3.11
       - run: python -m pip install --upgrade pip
       - run: python -m pip install -r requirements/ci.txt
       - run: tox -e static

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-python@v3
         with:
-          python-version: 3.8
+          python-version: 3.11
       - run: python -m pip install --upgrade pip
       - run: python -m pip install -r requirements/wheels.txt
 

pyproject.toml

@@ -26,7 +26,12 @@ classifiers = [
 ]
 requires-python = ">=3.11"
 dependencies = [
-    "fastapi",
+    "email-validator",
+    "fastapi >= 0.108",
+    "jinja2",
+    "jsonschema",
+    "pydantic",
+    "pydantic-settings",
 ]
 dynamic = ["version"]
 

requirements/base.in

@@ -1,2 +1,6 @@
-fastapi
+email-validator
+fastapi >= 0.108
+jinja2
+jsonschema
 pydantic
+pydantic-settings

requirements/base.txt

@@ -1,4 +1,4 @@
-# SHA1:df7ce1b491a85bde4c66124bd77383e903fb5722
+# SHA1:bb330365f0386228cefde857153626da1b4f23cd
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -7,25 +7,54 @@
 #
 annotated-types==0.6.0
     # via pydantic
-anyio==3.7.1
+anyio==4.2.0
+    # via starlette
+attrs==23.2.0
     # via
-    #   fastapi
-    #   starlette
-fastapi==0.104.1
+    #   jsonschema
+    #   referencing
+dnspython==2.4.2
+    # via email-validator
+email-validator==2.1.0.post1
+    # via -r requirements/base.in
+fastapi==0.108.0
     # via -r requirements/base.in
 idna==3.6
-    # via anyio
-pydantic==2.5.2
+    # via
+    #   anyio
+    #   email-validator
+jinja2==3.1.3
+    # via -r requirements/base.in
+jsonschema==4.20.0
+    # via -r requirements/base.in
+jsonschema-specifications==2023.12.1
+    # via jsonschema
+markupsafe==2.1.3
+    # via jinja2
+pydantic==2.5.3
     # via
     #   -r requirements/base.in
     #   fastapi
-pydantic-core==2.14.5
+    #   pydantic-settings
+pydantic-core==2.14.6
     # via pydantic
+pydantic-settings==2.1.0
+    # via -r requirements/base.in
+python-dotenv==1.0.0
+    # via pydantic-settings
+referencing==0.32.1
+    # via
+    #   jsonschema
+    #   jsonschema-specifications
+rpds-py==0.16.2
+    # via
+    #   jsonschema
+    #   referencing
 sniffio==1.3.0
     # via anyio
-starlette==0.27.0
+starlette==0.32.0.post1
     # via fastapi
-typing-extensions==4.8.0
+typing-extensions==4.9.0
     # via
     #   fastapi
     #   pydantic

requirements/ci.txt

@@ -11,7 +11,7 @@ chardet==5.2.0
     # via tox
 colorama==0.4.6
     # via tox
-distlib==0.3.7
+distlib==0.3.8
     # via virtualenv
 filelock==3.13.1
     # via

requirements/dev.in

@@ -9,5 +9,6 @@ jupyterlab
 mypy
 pip-compile-multi
 pre-commit
+uvicorn
 
 types-docutils

requirements/dev.txt

@@ -1,4 +1,4 @@
-# SHA1:f36bab5c5bea14fadf704e7f0ba17b3061953cbf
+# SHA1:1835a31fe992c4fa55da153dab45d5d296f65175
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -19,13 +19,14 @@ arrow==1.3.0
     # via isoduration
 async-lru==2.0.4
     # via jupyterlab
-black==23.11.0
+black==23.12.1
     # via -r requirements/dev.in
 click==8.1.7
     # via
     #   black
     #   pip-compile-multi
     #   pip-tools
+    #   uvicorn
 fqdn==1.5.1
     # via jsonschema
 isoduration==20.11.0
@@ -36,26 +37,27 @@ jsonpointer==2.4
     # via jsonschema
 jsonschema[format-nongpl]==4.20.0
     # via
+    #   -r requirements/base.in
     #   jupyter-events
     #   jupyterlab-server
     #   nbformat
 jupyter-events==0.9.0
     # via jupyter-server
 jupyter-lsp==2.2.1
     # via jupyterlab
-jupyter-server==2.11.2
+jupyter-server==2.12.4
     # via
     #   jupyter-lsp
     #   jupyterlab
     #   jupyterlab-server
     #   notebook-shim
-jupyter-server-terminals==0.4.4
+jupyter-server-terminals==0.5.1
     # via jupyter-server
-jupyterlab==4.0.9
+jupyterlab==4.0.10
     # via -r requirements/dev.in
 jupyterlab-server==2.25.2
     # via jupyterlab
-mypy==1.7.1
+mypy==1.8.0
     # via -r requirements/dev.in
 mypy-extensions==1.0.0
     # via
@@ -65,7 +67,7 @@ notebook-shim==0.2.3
     # via jupyterlab
 overrides==7.4.0
     # via jupyter-server
-pathspec==0.11.2
+pathspec==0.12.1
     # via black
 pip-compile-multi==2.6.3
     # via -r requirements/dev.in
@@ -91,12 +93,14 @@ terminado==0.18.0
     #   jupyter-server-terminals
 toposort==1.10
     # via pip-compile-multi
-types-docutils==0.20.0.3
+types-docutils==0.20.0.20240106
     # via -r requirements/dev.in
-types-python-dateutil==2.8.19.14
+types-python-dateutil==2.8.19.20240106
     # via arrow
 uri-template==1.3.0
     # via jsonschema
+uvicorn==0.25.0
+    # via -r requirements/dev.in
 webcolors==1.13
     # via jsonschema
 websocket-client==1.7.0

requirements/docs.txt

@@ -9,15 +9,15 @@
 -r test.txt
 accessible-pygments==0.0.4
     # via pydata-sphinx-theme
-alabaster==0.7.13
+alabaster==0.7.16
     # via sphinx
 autodoc-pydantic==2.0.1
     # via -r requirements/docs.in
-babel==2.13.1
+babel==2.14.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
-comm==0.2.0
+comm==0.2.1
     # via ipykernel
 debugpy==1.8.0
     # via ipykernel
@@ -29,7 +29,7 @@ docutils==0.20.1
     #   sphinx
 imagesize==1.4.1
     # via sphinx
-ipykernel==6.27.1
+ipykernel==6.28.0
     # via -r requirements/docs.in
 markdown-it-py==3.0.0
     # via
@@ -45,14 +45,10 @@ nbsphinx==0.9.3
     # via -r requirements/docs.in
 nest-asyncio==1.5.8
     # via ipykernel
-psutil==5.9.6
+psutil==5.9.7
     # via ipykernel
-pydantic-settings==2.1.0
-    # via autodoc-pydantic
 pydata-sphinx-theme==0.14.0
     # via -r requirements/docs.in
-python-dotenv==1.0.0
-    # via pydantic-settings
 snowballstemmer==2.2.0
     # via sphinx
 sphinx==7.2.6

requirements/static.txt

@@ -7,17 +7,17 @@
 #
 cfgv==3.4.0
     # via pre-commit
-distlib==0.3.7
+distlib==0.3.8
     # via virtualenv
 filelock==3.13.1
     # via virtualenv
-identify==2.5.32
+identify==2.5.33
     # via pre-commit
 nodeenv==1.8.0
     # via pre-commit
 platformdirs==4.1.0
     # via virtualenv
-pre-commit==3.5.0
+pre-commit==3.6.0
     # via -r requirements/static.in
 pyyaml==6.0.1
     # via pre-commit

requirements/test.in

@@ -1,5 +1,5 @@
 -r base.in
-httpx
+httpx  # for async testing
 ipython
 nbconvert
 pytest