diff --git a/.pyre/pyre.stderr b/.pyre/pyre.stderr index cbd37cdf..8279e8ed 100644 --- a/.pyre/pyre.stderr +++ b/.pyre/pyre.stderr @@ -1700,3 +1700,164 @@ Traceback (most recent call last): File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create raise configuration_module.InvalidConfiguration( pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:18:49,293 [PID 76056] DEBUG Using selector: KqueueSelector +2023-01-31 15:18:49,294 [PID 76056] INFO Reading Pyre server configurations... +2023-01-31 15:18:49,294 [PID 76056] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:18:49,296 [PID 76056] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:19:22,752 [PID 76343] DEBUG Using selector: KqueueSelector +2023-01-31 15:19:22,753 [PID 76343] INFO Reading Pyre server configurations... +2023-01-31 15:19:22,753 [PID 76343] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:19:22,754 [PID 76343] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:23:46,994 [PID 79588] DEBUG Using selector: KqueueSelector +2023-01-31 15:23:46,995 [PID 79588] INFO Reading Pyre server configurations... +2023-01-31 15:23:46,995 [PID 79588] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:23:46,996 [PID 79588] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:27:26,718 [PID 81160] DEBUG Using selector: KqueueSelector +2023-01-31 15:27:26,718 [PID 81160] INFO Reading Pyre server configurations... +2023-01-31 15:27:26,718 [PID 81160] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:27:26,719 [PID 81160] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:27:44,750 [PID 81512] DEBUG Using selector: KqueueSelector +2023-01-31 15:27:44,750 [PID 81512] INFO Reading Pyre server configurations... +2023-01-31 15:27:44,750 [PID 81512] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:27:44,752 [PID 81512] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:29:49,772 [PID 83731] DEBUG Using selector: KqueueSelector +2023-01-31 15:29:49,772 [PID 83731] INFO Reading Pyre server configurations... +2023-01-31 15:29:49,773 [PID 83731] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:29:49,774 [PID 83731] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. +2023-01-31 15:30:36,219 [PID 85451] DEBUG Using selector: KqueueSelector +2023-01-31 15:30:36,219 [PID 85451] INFO Reading Pyre server configurations... +2023-01-31 15:30:36,219 [PID 85451] INFO No binary specified, looking for `pyre.bin` in PATH +2023-01-31 15:30:36,220 [PID 85451] ERROR Uncaught error in persistent.run +Traceback (most recent call last): + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 502, in run + return asyncio.get_event_loop().run_until_complete( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.pyenv/versions/3.11.1/lib/python3.11/asyncio/base_events.py", line 653, in run_until_complete + return future.result() + ^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/persistent.py", line 436, in run_persistent + initial_server_options = launch_and_subscribe_handler.PyreDaemonLaunchAndSubscribeHandler.read_server_options( + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/launch_and_subscribe_handler.py", line 120, in read_server_options + return server_options_reader() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 93, in read + return PyreServerOptions.create( + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "/Users/annieehler/.local/share/nvim/mason/packages/pyre/venv/lib/python3.11/site-packages/pyre_check/client/commands/pyre_server_options.py", line 60, in create + raise configuration_module.InvalidConfiguration( +pyre_check.client.configuration.exceptions.InvalidConfiguration: Invalid configuration: Cannot locate a Pyre binary to run. diff --git a/SLEAPyExample.ipynb b/SLEAPyExample.ipynb index 46196a52..fd847546 100644 --- a/SLEAPyExample.ipynb +++ b/SLEAPyExample.ipynb @@ -20,7 +20,10 @@ } ], "source": [ - "from sleapyfaces import Experiment" + "from sleapyfaces.base import Experiment\n", + "\n", + "expr = Experiment(\n", + ")" ] }, { @@ -33,18 +36,17 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "sleapyfaces", "language": "python", "name": "python3" }, "language_info": { "name": "python", - "version": "3.11.1 (main, Dec 23 2022, 09:28:24) [Clang 14.0.0 (clang-1400.0.29.202)]" + "version": "3.11.0 | packaged by conda-forge | (main, Jan 14 2023, 12:26:40) [Clang 14.0.6 ]" }, - "orig_nbformat": 4, "vscode": { "interpreter": { - "hash": "5c7b89af1651d0b8571dde13640ecdccf7d5a6204171d6ab33e7c296e100e08a" + "hash": "b0ea88426352522f750fe5516728f15656e2289bf25c218d2f74ad9754db936f" } } }, diff --git a/SLEAPyExample.py b/SLEAPyExample.py new file mode 100644 index 00000000..a3430410 --- /dev/null +++ b/SLEAPyExample.py @@ -0,0 +1,21 @@ +# --- +# jupyter: +# jupytext: +# text_representation: +# extension: .py +# format_name: percent +# format_version: '1.3' +# jupytext_version: 1.14.4 +# kernelspec: +# display_name: sleapyfaces +# language: python +# name: python3 +# --- + +# %% +from sleapyfaces.base import Experiment + +expr = Experiment( +) + +# %% diff --git a/environment.yml b/environment.yml index a04dc72f..c3bc3e58 100644 --- a/environment.yml +++ b/environment.yml @@ -2,8 +2,20 @@ name: sleapyfaces channels: - conda-forge dependencies: + - anyio=3.6.2=pyhd8ed1ab_0 - aom=3.5.0=h7ea286d_0 - appdirs=1.4.4=pyh9f0ad1d_0 + - appnope=0.1.3=pyhd8ed1ab_0 + - argon2-cffi=21.3.0=pyhd8ed1ab_0 + - argon2-cffi-bindings=21.2.0=py311he2be06e_3 + - asttokens=2.2.1=pyhd8ed1ab_0 + - attrs=22.2.0=pyh71513ae_0 + - babel=2.11.0=pyhd8ed1ab_0 + - backcall=0.2.0=pyh9f0ad1d_0 + - backports=1.0=pyhd8ed1ab_3 + - backports.functools_lru_cache=1.6.4=pyhd8ed1ab_0 + - beautifulsoup4=4.11.1=pyha770c72_0 + - bleach=6.0.0=pyhd8ed1ab_0 - brotlipy=0.7.0=py311he2be06e_1005 - bzip2=1.0.8=h3422bc3_4 - c-ares=1.18.1=h3422bc3_0 @@ -14,10 +26,17 @@ dependencies: - cffi=1.15.1=py311hae827db_3 - charset-normalizer=2.1.1=pyhd8ed1ab_0 - click=8.1.3=unix_pyhd8ed1ab_2 + - comm=0.1.2=pyhd8ed1ab_0 - cryptography=39.0.0=py311h507f6e9_0 + - debugpy=1.6.6=py311ha397e9f_0 + - decorator=5.1.1=pyhd8ed1ab_0 + - defusedxml=0.7.1=pyhd8ed1ab_0 + - entrypoints=0.4=pyhd8ed1ab_0 + - executing=1.2.0=pyhd8ed1ab_0 - expat=2.5.0=hb7217d7_0 - ffmpeg=5.1.2=gpl_hf318d42_106 - ffmpeg-python=0.2.0=py_0 + - flit-core=3.8.0=pyhd8ed1ab_0 - font-ttf-dejavu-sans-mono=2.37=hab24e00_0 - font-ttf-inconsolata=3.000=h77eed37_0 - font-ttf-source-code-pro=2.038=h77eed37_0 @@ -34,7 +53,29 @@ dependencies: - hdf5=1.12.2=nompi_ha7af310_101 - icu=70.1=h6b3803e_0 - idna=3.4=pyhd8ed1ab_0 + - importlib-metadata=6.0.0=pyha770c72_0 + - importlib_metadata=6.0.0=hd8ed1ab_0 + - importlib_resources=5.10.2=pyhd8ed1ab_0 + - ipykernel=6.21.0=pyh736e0ef_0 + - ipython=8.9.0=pyhd1c38e8_0 + - ipython_genutils=0.2.0=py_1 + - ipywidgets=8.0.4=pyhd8ed1ab_0 + - jedi=0.18.2=pyhd8ed1ab_0 + - jinja2=3.1.2=pyhd8ed1ab_1 - joblib=1.2.0=pyhd8ed1ab_0 + - json5=0.9.5=pyh9f0ad1d_0 + - jsonschema=4.17.3=pyhd8ed1ab_0 + - jupyter=1.0.0=py311h267d04e_8 + - jupyter_client=8.0.2=pyhd8ed1ab_0 + - jupyter_console=6.4.4=pyhd8ed1ab_0 + - jupyter_core=5.2.0=py311h267d04e_0 + - jupyter_events=0.6.3=pyhd8ed1ab_0 + - jupyter_server=2.1.0=pyhd8ed1ab_0 + - jupyter_server_terminals=0.4.4=pyhd8ed1ab_1 + - jupyterlab=3.5.3=pyhd8ed1ab_0 + - jupyterlab_pygments=0.2.2=pyhd8ed1ab_0 + - jupyterlab_server=2.19.0=pyhd8ed1ab_0 + - jupyterlab_widgets=3.0.5=pyhd8ed1ab_0 - krb5=1.20.1=h69eda48_0 - lame=3.100=h1a8c8d9_1003 - libaec=1.0.6=hb7217d7_1 @@ -54,6 +95,7 @@ dependencies: - libopenblas=0.3.21=openmp_hc731615_3 - libopus=1.3.1=h27ca646_1 - libpng=1.6.39=h76d750c_0 + - libsodium=1.0.18=h27ca646_1 - libsqlite=3.40.0=h76d750c_0 - libssh2=1.10.0=h7a5bd25_3 - libtasn1=4.19.0=h1a8c8d9_0 @@ -62,38 +104,118 @@ dependencies: - libxml2=2.10.3=h87b0503_0 - libzlib=1.2.13=h03a7124_4 - llvm-openmp=15.0.7=h7cfbb63_0 + - markupsafe=2.1.2=py311he2be06e_0 + - matplotlib-inline=0.1.6=pyhd8ed1ab_0 + - mistune=2.0.4=pyhd8ed1ab_0 + - nbclassic=0.4.8=pyhd8ed1ab_0 + - nbclient=0.7.2=pyhd8ed1ab_0 + - nbconvert=7.2.9=pyhd8ed1ab_0 + - nbconvert-core=7.2.9=pyhd8ed1ab_0 + - nbconvert-pandoc=7.2.9=pyhd8ed1ab_0 + - nbformat=5.7.3=pyhd8ed1ab_0 - ncurses=6.3=h07bb92c_1 + - nest-asyncio=1.5.6=pyhd8ed1ab_0 - nettle=3.8.1=h63371fa_1 + - notebook=6.5.2=pyha770c72_1 + - notebook-shim=0.2.2=pyhd8ed1ab_0 - numpy=1.24.1=py311h60f8152_0 - openh264=2.3.1=hb7217d7_1 - openssl=3.0.7=h03a7124_2 - p11-kit=0.24.1=h29577a5_0 - packaging=23.0=pyhd8ed1ab_0 - pandas=1.5.3=py311h4eec4a9_0 + - pandoc=2.19.2=hce30654_1 + - pandocfilters=1.5.0=pyhd8ed1ab_0 + - parso=0.8.3=pyhd8ed1ab_0 + - pexpect=4.8.0=pyh1a96a4e_2 + - pickleshare=0.7.5=py_1003 - pip=23.0=pyhd8ed1ab_0 + - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0 + - platformdirs=2.6.2=pyhd8ed1ab_0 - plotly=5.13.0=pyhd8ed1ab_0 - pooch=1.6.0=pyhd8ed1ab_0 + - prometheus_client=0.16.0=pyhd8ed1ab_0 + - prompt-toolkit=3.0.36=pyha770c72_0 + - prompt_toolkit=3.0.36=hd8ed1ab_0 + - psutil=5.9.4=py311he2be06e_0 + - ptyprocess=0.7.0=pyhd3deb0d_0 + - pure_eval=0.2.2=pyhd8ed1ab_0 - pycparser=2.21=pyhd8ed1ab_0 + - pygments=2.14.0=pyhd8ed1ab_0 - pyopenssl=23.0.0=pyhd8ed1ab_0 + - pyrsistent=0.19.3=py311he2be06e_0 - pysocks=1.7.1=pyha2e5f31_6 - python=3.11.0=h3ba56d0_1_cpython - python-dateutil=2.8.2=pyhd8ed1ab_0 + - python-fastjsonschema=2.16.2=pyhd8ed1ab_0 + - python-json-logger=2.0.4=pyhd8ed1ab_0 - python_abi=3.11=3_cp311 - pytz=2022.7.1=pyhd8ed1ab_0 + - pyyaml=6.0=py311he2be06e_5 + - pyzmq=25.0.0=py311h0f351f6_0 - readline=8.1.2=h46ed386_0 - requests=2.28.2=pyhd8ed1ab_0 + - rfc3339-validator=0.1.4=pyhd8ed1ab_0 + - rfc3986-validator=0.1.1=pyh9f0ad1d_0 - scikit-learn=1.2.1=py311hba7d9bc_0 - scipy=1.10.0=py311h0bcca16_0 + - send2trash=1.8.0=pyhd8ed1ab_0 - setuptools=66.1.1=pyhd8ed1ab_0 - six=1.16.0=pyh6c4a22f_0 + - sniffio=1.3.0=pyhd8ed1ab_0 + - soupsieve=2.3.2.post1=pyhd8ed1ab_0 + - stack_data=0.6.2=pyhd8ed1ab_0 - svt-av1=1.4.1=h7ea286d_0 - tenacity=8.1.0=pyhd8ed1ab_0 + - terminado=0.17.1=pyhd1c38e8_0 - threadpoolctl=3.1.0=pyh8a188c0_0 + - tinycss2=1.2.1=pyhd8ed1ab_0 - tk=8.6.12=he1e0b03_0 + - tomli=2.0.1=pyhd8ed1ab_0 + - tornado=6.2=py311he2be06e_1 + - traitlets=5.9.0=pyhd8ed1ab_0 + - typing-extensions=4.4.0=hd8ed1ab_0 + - typing_extensions=4.4.0=pyha770c72_0 - tzdata=2022g=h191b570_0 - urllib3=1.26.14=pyhd8ed1ab_0 + - wcwidth=0.2.6=pyhd8ed1ab_0 + - webencodings=0.5.1=py_1 + - websocket-client=1.5.0=pyhd8ed1ab_0 - wheel=0.38.4=pyhd8ed1ab_0 + - widgetsnbextension=4.0.5=pyhd8ed1ab_0 - x264=1!164.3095=h57fd34a_2 - x265=3.5=hbc6ce65_3 - xz=5.2.6=h57fd34a_0 + - yaml=0.2.5=h3422bc3_2 + - zeromq=4.3.4=hbdafb3b_1 + - zipp=3.12.0=pyhd8ed1ab_0 + - pip: + - blosc2==2.0.0 + - contourpy==1.0.7 + - coverage==7.1.0 + - cycler==0.11.0 + - cython==0.29.33 + - fonttools==4.38.0 + - geomstats==2.5.0 + - iniconfig==2.0.0 + - kiwisolver==1.4.4 + - matplotlib==3.6.3 + - more-itertools==9.0.0 + - msgpack==1.0.4 + - numexpr==2.8.4 + - pathvalidate==2.5.2 + - patsy==0.5.3 + - pillow==9.4.0 + - pluggy==1.0.0 + - py-cpuinfo==9.0.0 + - pyparsing==3.0.9 + - pytest==7.2.1 + - pytest-cov==4.0.0 + - python-configuration==0.8.2 + - python-rapidjson==1.9 + - seaborn==0.12.2 + - sleapyfaces==1.2.7 + - statsmodels==0.13.5 + - tables==3.8.0 prefix: /Users/annieehler/.pyenv/versions/mambaforge-22.9.0-3/envs/sleapyfaces + diff --git a/sleapyfaces/__about__.py b/sleapyfaces/__about__.py index 4f8f9acc..b53e03dd 100644 --- a/sleapyfaces/__about__.py +++ b/sleapyfaces/__about__.py @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2022-present Annie Ehler # # SPDX-License-Identifier: MIT -__version__ = "1.2.7" +__version__ = "1.2.8" __author__ = "Analetta (Annie) Ehler" __author_email__ = "annie.ehler.4@gmail.com" __license__ = "MIT" diff --git a/sleapyfaces/__init__.py b/sleapyfaces/__init__.py index bc5b1521..ae3f5263 100644 --- a/sleapyfaces/__init__.py +++ b/sleapyfaces/__init__.py @@ -3,4 +3,5 @@ # SPDX-License-Identifier: MIT from sleapyfaces import base, clustering, config, docstring, files, utils, config from sleapyfaces.__about__ import * +from sleapyfaces.base import Experiment, Project, Projects from sleapyfaces.utils import normalize, structs diff --git a/sleapyfaces/docstring.py b/sleapyfaces/docstring.py index 7c9c077f..30dfa476 100644 --- a/sleapyfaces/docstring.py +++ b/sleapyfaces/docstring.py @@ -43,7 +43,7 @@ def get_with_inst(self, obj, cls): overridden = getattr(super(cls, obj), self.name, None) - @wraps(self.mthd, assigned=('__name__','__module__')) + @wraps(self.mthd, assigned=("__name__", "__module__")) def f(*args, **kwargs): return self.mthd(obj, *args, **kwargs) @@ -53,9 +53,10 @@ def get_no_inst(self, cls): for parent in cls.__mro__[1:]: overridden = getattr(parent, self.name, None) - if overridden: break + if overridden: + break - @wraps(self.mthd, assigned=('__name__','__module__')) + @wraps(self.mthd, assigned=("__name__", "__module__")) def f(*args, **kwargs): return self.mthd(*args, **kwargs) @@ -63,8 +64,9 @@ def f(*args, **kwargs): def use_parent_doc(self, func, source): if source is None: - raise NameError, ("Can't find '%s' in parents" % self.name) + raise NameError("Can't find '%s' in parents" % self.name) func.__doc__ = source.__doc__ return func + doc_inherit = DocInherit