ethoscopy 2.2.1__tar.gz → 2.3.0__tar.gz

ethoscopy-2.3.0/.gitignore

@@ -0,0 +1,24 @@
+*.txt
+*.pyc
+*venv
+dist/
+*vscode
+__pycache__/
+ethoscopy.egg-info/
+.gitignore
+*.pkl
+.python-version
+tmp
+
+# JupyterHub runtime state, generated when the Docker stack first runs.
+# jupyterhub_cookie_secret signs session cookies and jupyterhub.sqlite holds
+# user records and API tokens; neither belongs in the repo. Committing the
+# secret would be the same failure as the tracked .env.keycloak removed in
+# 6cbcbbe. jupyterhub_config.py stays tracked - it is configuration, not state.
+Docker/jupyterhub_data/jupyterhub_cookie_secret
+Docker/jupyterhub_data/jupyterhub.sqlite
+
+# Coverage output
+.coverage
+htmlcov/
+coverage.xml

{ethoscopy-2.2.1 → ethoscopy-2.3.0}/Docker/Dockerfile

@@ -106,7 +106,7 @@ RUN pip3 install \
         pyarrow \
         tqdm \
         jupyterlab-git \
-        ethoscopy==2.2.0
+        ethoscopy==2.2.1
        # pycatch22
 
 # Pre-populate tutorial datasets inside the installed package so non-root

{ethoscopy-2.2.1 → ethoscopy-2.3.0}/Docker/docker-compose.yml

@@ -6,7 +6,7 @@ services:
       dockerfile: Dockerfile
       args:
         JUPYTER_HUB_TAG: ${JUPYTER_HUB_TAG:-5.4.0}
-    image: ggilestro/ethoscope-lab:${ETHOSCOPE_LAB_TAG:-1.3}
+    image: ggilestro/ethoscope-lab:${ETHOSCOPE_LAB_TAG:-1.4}
     container_name: ethoscope-lab
     ports:
       - 8082:8000

{ethoscopy-2.2.1 → ethoscopy-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ethoscopy
-Version: 2.2.1
+Version: 2.3.0
 Summary: "A python based toolkit to download and anlyse data from the Ethoscope hardware system."
 Author-email: Lblackhurst29 <lblackhurst29@gmail.com>
 License-File: LICENSE
@@ -19,6 +19,7 @@ Requires-Dist: hmmlearn<0.4.0,>=0.3.2
 Requires-Dist: nbformat<6.0.0,>=5.10.4
 Requires-Dist: numpy<3.0.0,>=2.0.0
 Requires-Dist: pandas<3.0.0,>=2.2.2
+Requires-Dist: pillow<13.0,>=10.0
 Requires-Dist: plotly<6.0.0,>=5.22.0
 Requires-Dist: pywavelets<2.0.0,>=1.6.0
 Requires-Dist: seaborn<0.14.0,>=0.13.2

{ethoscopy-2.2.1 → ethoscopy-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ethoscopy"
-version = "2.2.1"
+version = "2.3.0"
 description = "\"A python based toolkit to download and anlyse data from the Ethoscope hardware system.\""
 authors = [{name = "Lblackhurst29",email = "lblackhurst29@gmail.com"}]
 readme = "README.md"
@@ -16,6 +16,10 @@ dependencies = [
     "astropy>=7.0,<8.0",
     "nbformat>=5.10.4,<6.0.0",
     "tqdm>=4.66,<5.0",
+    # estimate_light_cycle() decodes the stored IMG_SNAPSHOTS JPEGs. Pillow
+    # already arrived transitively through seaborn -> matplotlib; this makes the
+    # direct dependency explicit.
+    "pillow>=10.0,<13.0",
 ]
 requires-python = ">=3.12,<4.0"
 classifiers = [

{ethoscopy-2.2.1 → ethoscopy-2.3.0}/src/ethoscopy/__init__.py

@@ -15,8 +15,11 @@ from ethoscopy.analyse import (
 from ethoscopy.behavpy import behavpy
 from ethoscopy.load import (
     download_from_remote_dir,
+    estimate_light_cycle,
     link_meta_index,
     load_ethoscope,
+    load_ethoscope_diagnostics,
+    load_ethoscope_light_schedule,
     load_ethoscope_metadata,
 )
 from ethoscopy.misc.general_functions import concat
@@ -28,9 +31,12 @@ __all__ = [
     "behavpy",
     "download_from_remote_dir",
     "download_tutorial_data",
+    "estimate_light_cycle",
     "get_tutorial",
     "link_meta_index",
     "load_ethoscope",
+    "load_ethoscope_diagnostics",
+    "load_ethoscope_light_schedule",
     "load_ethoscope_metadata",
     "max_velocity_detector",
     "sleep_annotation",