Merge branch 'develop' into tests

.github/workflows/test.yml

@@ -34,12 +34,18 @@ jobs:
         with:
           python-version-file: API/pyproject.toml
           # cache: 'pip'
+
+      # 3.4.3. Install Poetry
+      - name: Install Poetry
+        run: |
+          pip install poetry
+          poetry --version
           
       # Install dependencies (if any). They will be cached with saved for next time with the cache command above
 
       - name: Install
         run: pip install API/.
 
-      # 3.4.3. Run tests (execute arbitrary commands in shell)
+      # 3.4.4. Run tests (execute arbitrary commands in shell)
       - name: 🏃Run tests
         run: python -m unittest discover -s API

.github/workflows/version_bump.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Extract current version from API/pyproject.toml
         id: extract-version
         run: |
-          version=$(python -c "import toml; print(toml.load('API/pyproject.toml')['project']['version'])")
+          version=$(python -c "import toml; print(toml.load('API/pyproject.toml')['tool.poetry']['version'])")
           echo "Current version: $version"
           echo "::set-output name=current_version::$version"
 

.gitignore

@@ -107,3 +107,4 @@ UnityClient/Packages/*
 editable_venv/*
 API/build/*
 API/oursin.egg-info/*
+API/poetry.lock

API/oursin.egg-info/requires.txt

@@ -1,3 +1,3 @@
-python-socketio[client]<5.10,>=5.8
+python-socketio[client]>=5.8,<5.11
 numpy>=1.24.3,<1.27.0
-Pillow<10.1,>=9.5
+Pillow>=9.5,<10.2

API/oursin/__init__.py

@@ -4,7 +4,7 @@
 Python library for connecting to and sending data to a Universal Renderer for Neuroscience renderer.
 """
 __author__ = 'Daniel Birman'
-__version__ = "0.4.7"
+__version__ = "0.5.0"
 
 # load the client
 from . import client
@@ -18,8 +18,8 @@
 
 # load the object controls
 from . import lines
-from . import neurons
-from . import primitives
+from . import meshes
+from . import particles
 from . import probes
 from . import text
 from . import volumes

API/oursin/atlas/__init__.py

@@ -1,2 +1,5 @@
-from . import ccf
-from . import waxholm
+from .ontology import *
+
+ccf25 = Atlas('ccf25')
+waxholm39 = Atlas('waxholm39')
+waxholm78 = Atlas('waxholm78')