rework streamlit and numpy deps to work better with python 3.9

Author: Mike Prosser

CONTRIBUTING.md

@@ -56,15 +56,14 @@ start docs\_build\index.html
 
 ## Running examples
 
-1. First, run the PythonPanelService (not part of this repo, provided seperately)
-2. Run the command `poetry run python examples/hello/hello.py`
-3. Open http://localhost:42001/panel-service/panels/hello_panel/ in your browser
-4. If there is an error about missing imports (especially nipanel), execute this
-   command (from the nipanel-python directory) to install the dependencies into the venv: 
-   `%localappdata%\Temp\python_panel_service_venv\Scripts\python.exe -m pip install .\[examples,dev]`,
-    then restart the PythonPanelService and re-run hello.py.
-
-You can see all running panels (and stop them) at: http://localhost:42001/panel-service/
+1. Run the **PythonPanelService** (not part of this repo, provided seperately)
+2. `poetry install --with examples` to get the dependencies needed for the examples
+3. Run the command(s):
+    - `poetry run python examples/hello/hello.py`
+    - `poetry run python examples/all_types/all_types.py`
+    - `poetry run python examples/simple_graph/simple_graph.py`
+    - `poetry run python examples/nidaqmx/nidaqmx_continuous_analog_input.py` (requires real or simulated devices)
+4. Open http://localhost:42001/panel-service/ in your browser, which will show all running panels
 
 # Debugging on the streamlit side
 

examples/all_types/all_types_panel.py

@@ -5,11 +5,11 @@
 
 import nipanel
 
-panel = nipanel.get_panel_accessor()
 
 st.set_page_config(page_title="All Types Example", page_icon="📊", layout="wide")
 st.title("All Types Example")
 
+panel = nipanel.get_panel_accessor()
 for name in all_types_with_values.keys():
     col1, col2 = st.columns([0.4, 0.6])
 

examples/hello/hello_panel.py

@@ -4,8 +4,9 @@
 
 import nipanel
 
-panel = nipanel.get_panel_accessor()
 
 st.set_page_config(page_title="Hello World Example", page_icon="📊", layout="wide")
 st.title("Hello World Example")
+
+panel = nipanel.get_panel_accessor()
 st.write(panel.get_value("hello_string", ""))

examples/nidaqmx/nidaqmx_continuous_analog_input.py

@@ -21,7 +21,9 @@
     try:
         print(f"\nPress Ctrl + C to stop")
         while True:
-            data = task.read(number_of_samples_per_channel=1000)
+            data = task.read(
+                number_of_samples_per_channel=1000  # pyright: ignore[reportArgumentType]
+            )
             panel.set_value("voltage_data", data[0])
             panel.set_value("thermocouple_data", data[1])
     except KeyboardInterrupt:

examples/simple_graph/simple_graph_panel.py

@@ -5,11 +5,11 @@
 
 import nipanel
 
-panel = nipanel.get_panel_accessor()
 
 st.set_page_config(page_title="Simple Graph Example", page_icon="📈", layout="wide")
 st.title("Simple Graph Example")
 
+panel = nipanel.get_panel_accessor()
 time_points = panel.get_value("time_points", [0.0])
 sine_values = panel.get_value("sine_values", [0.0])
 amplitude = panel.get_value("amplitude", 1.0)

poetry.lock

@@ -12,9 +12,15 @@ grpcio = {version=">=1.49.0,<2.0"}
 protobuf = {version=">=4.21"}
 ni-measurement-plugin-sdk = {version=">=2.3"}
 typing-extensions = ">=4.13.2"
-streamlit = ">=1.24"
-streamlit-echarts = ">=0.4.0"
+streamlit = [
+  {version=">=1.24,<1.33", python=">=3.9,<3.10"},
+  {version=">=1.24", python=">=3.10"}
+]
 nitypes = {version=">=0.1.0dev2", allow-prereleases=true}
+numpy = [
+  {version=">=1.20.0,<2.0.0", python=">=3.9,<3.10"},
+  {version=">=2.0.0", python=">=3.10"}
+]
 debugpy = ">=1.8.1"
 
 [tool.poetry.group.dev.dependencies]