Merge pull request #367 from maxfordham/tidy-up-config-files

Tidy-up-config-files

Author: jgunstone

environment.yml

@@ -1,7 +1,7 @@
-name: ipyautoui-dev
-# channels priority
-# see https://bioconda.github.io/
-# conda-forge has highest prioriy
+name: ipyautoui-binder
+# NOTE: this is used for Binder only
+#       required as repo2docker does not support pixi
+#       https://repo2docker.readthedocs.io/en/latest/configuration/index.html
 channels:
   - defaults
   - conda-forge
@@ -21,11 +21,8 @@ dependencies:
   - nb_black
   - pytest
   - altair # optional
-  - halo # optional
   - plotly # optional
   - pip
   - pip:
-    # - maplocal==0.2.1
-    - pydantic-extra-types
     - pytest-examples
     - -e .

pixi.lock

@@ -9,9 +9,13 @@ dynamic = ["version"]
 description = "wrapper that sits on top of ipywidgets and other ipy widget libraries to template / automate the creation of widget forms. Uses pydantic to create defined data-container and serialisation to JSON. Includes example patterns for adding new custom widgets."
 readme = "README.md"
 authors = [{ name = "John Gunstone", email = "gunstone.john@gmail.com" }]
-keywords = ["ipyautoui"]
+maintainers = [
+  { name = "John Gunstone", email = "gunstone.john@gmail.com" },
+  { name = "Olly Hensby", email = "o.hensby@maxfordham.com" },
+]
+keywords = ["ipyautoui", "ui", "ipywidgets", "pydantic", "jsonschema", "form"]
 classifiers = [
-    "Development Status :: 2 - Pre-Alpha",
+    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Natural Language :: English",
     "Programming Language :: Python :: 3.9",
@@ -20,14 +24,14 @@ dependencies = [
     "immutables",
     "ipython",
     "ipywidgets>8",
-    "jupyterlab>=4.2",
     "ipydatagrid==1.3.2",
     "ipyfilechooser",       # make optional
     "ipyvuetify",           # make optional
     "markdown",
     "jsonref",
     "numpy",
     "openpyxl",
+    "requests",
     "pandas",
     "pydantic>=2",
     "pydantic-settings",
@@ -40,6 +44,10 @@ dependencies = [
 
 [project.urls]
 Homepage = "https://github.com/maxfordham/ipyautoui"
+Documentation = "https://maxfordham.github.io/ipyautoui/"
+Issues = "https://github.com/maxfordham/ipyautoui/issues"
+Changelog = "https://github.com/maxfordham/ipyautoui/releases"
+
 
 [tool.hatch.version]
 source = "vcs"
@@ -66,7 +74,6 @@ pytest_examples = "*"
 
 [tool.pixi.feature.tests.dependencies]
 pytest = "*"
-# maplocal= "0.2.1"
 hatch = "*"
 
 [tool.pixi.feature.dev.pypi-dependencies]
@@ -80,6 +87,7 @@ notebook_intelligence = "*"
 quarto = ">=1.6.40,<2"
 
 [tool.pixi.feature.docs.dependencies]
+jupyterlab = "*"
 quarto = ">=1.6.40,<2"
 
 [tool.pixi.environments]

pyproject.toml

@@ -32,7 +32,7 @@
 import traitlets as tr
 import typing as ty
 from io import StringIO, BytesIO
-from pydantic import HttpUrl, parse_obj_as
+from pydantic import HttpUrl
 
 
 #  local imports
@@ -203,7 +203,7 @@ def __init__(self, path: ty.Union[pathlib.Path, HttpUrl, ty.Callable]):
     @tr.observe("path")
     def _observe_path(self, change):
         byts = getbytes(self.path)
-        self.xl = pd.ExcelFile(BytesIO(byts))
+        self.xl = pd.ExcelFile(BytesIO(byts)) # NOTE: requires openpyxl
 
     @tr.observe("xl")
     def _observe_xl(self, change):

src/ipyautoui/autodisplay_renderers.py

@@ -20,7 +20,6 @@
 a UI element that loads a folder for data caching, whilst storing a record of folders in use
 """
 
-# %run ../_dev_maplocal_params.py
 
 # -
 

src/ipyautoui/custom/decision_branch.py

@@ -18,7 +18,6 @@
 # +
 """General widget for editing data"""
 
-# %run ../_dev_maplocal_params.py
 
 # TODO: move editgrid.py to root ?
 

src/ipyautoui/custom/editgrid.py

@@ -14,7 +14,6 @@
 # ---
 
 """wrapper for ipyfilechooster.FileChooser"""
-# %run ../_dev_maplocal_params.py
 
 
 import pathlib

src/ipyautoui/custom/filechooser.py

@@ -14,7 +14,6 @@
 #     name: python3
 # ---
 
-# %run ../_dev_maplocal_params.py
 #
 
 

src/ipyautoui/custom/filesindir.py

@@ -17,7 +17,6 @@
 
 """file upload wrapper"""
 
-# %run ../_dev_maplocal_params.py
 
 # +
 import ipywidgets as w