From e82653889d25c7fe19c23efd648526178c62921b Mon Sep 17 00:00:00 2001 From: Drew Bednar Date: Sun, 10 Dec 2023 15:16:50 -0500 Subject: [PATCH] New depedencies --- README.md | 13 +++ dev_requirements.in | 2 + dev_requirements.txt | 9 +- macos-py3.11-dev-requirements.txt | 69 ++++++++++++ macos-py3.11-requirements.txt | 175 ++++++++++++++++++++++++++++++ requirements.txt | 47 ++++++-- tasks.py | 8 +- 7 files changed, 309 insertions(+), 14 deletions(-) create mode 100644 macos-py3.11-dev-requirements.txt create mode 100644 macos-py3.11-requirements.txt diff --git a/README.md b/README.md index 18e526c..d6e704c 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,16 @@ There are two protocol's at play with the Moteus you need to be aware of: ## Firmware updates Firmware updates will unlock newer features of the boards. Follow these instructions https://github.com/mjbots/moteus/blob/main/docs/reference.md#flashing-over-can when you need to upgrade the controllers. + + +## Quickstart + +Launching t-view + +``` +python -m moteus_gui.tview +``` + +Calibrating a new motor + +`````` \ No newline at end of file diff --git a/dev_requirements.in b/dev_requirements.in index f868356..41a6220 100644 --- a/dev_requirements.in +++ b/dev_requirements.in @@ -1,3 +1,5 @@ +-c requirements.txt + black pip-tools pre-commit diff --git a/dev_requirements.txt b/dev_requirements.txt index b3cb705..baf96d4 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # pip-compile dev_requirements.in @@ -30,6 +30,7 @@ nodeenv==1.7.0 # via pre-commit packaging==23.1 # via + # -c requirements.txt # black # build pathspec==0.11.1 @@ -38,6 +39,7 @@ pip-tools==6.13.0 # via -r dev_requirements.in platformdirs==3.5.0 # via + # -c requirements.txt # black # virtualenv pre-commit==3.3.1 @@ -52,6 +54,11 @@ tomli==2.0.1 # via # black # build + # pyproject-hooks +typing-extensions==4.5.0 + # via + # -c requirements.txt + # black virtualenv==20.23.0 # via pre-commit wheel==0.40.0 diff --git a/macos-py3.11-dev-requirements.txt b/macos-py3.11-dev-requirements.txt new file mode 100644 index 0000000..baf96d4 --- /dev/null +++ b/macos-py3.11-dev-requirements.txt @@ -0,0 +1,69 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile dev_requirements.in +# +black==23.3.0 + # via -r dev_requirements.in +build==0.10.0 + # via pip-tools +cfgv==3.3.1 + # via pre-commit +click==8.1.3 + # via + # black + # pip-tools +distlib==0.3.6 + # via virtualenv +filelock==3.12.0 + # via virtualenv +identify==2.5.24 + # via pre-commit +invoke==2.1.1 + # via -r dev_requirements.in +isort==5.12.0 + # via -r dev_requirements.in +mypy-extensions==1.0.0 + # via black +nodeenv==1.7.0 + # via pre-commit +packaging==23.1 + # via + # -c requirements.txt + # black + # build +pathspec==0.11.1 + # via black +pip-tools==6.13.0 + # via -r dev_requirements.in +platformdirs==3.5.0 + # via + # -c requirements.txt + # black + # virtualenv +pre-commit==3.3.1 + # via -r dev_requirements.in +pyproject-hooks==1.0.0 + # via build +pyyaml==6.0 + # via pre-commit +ruff==0.0.264 + # via -r dev_requirements.in +tomli==2.0.1 + # via + # black + # build + # pyproject-hooks +typing-extensions==4.5.0 + # via + # -c requirements.txt + # black +virtualenv==20.23.0 + # via pre-commit +wheel==0.40.0 + # via pip-tools + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools diff --git a/macos-py3.11-requirements.txt b/macos-py3.11-requirements.txt new file mode 100644 index 0000000..00db2a8 --- /dev/null +++ b/macos-py3.11-requirements.txt @@ -0,0 +1,175 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# pip-compile requirements.in +# +appnope==0.1.3 + # via + # ipykernel + # ipython +asttokens==2.2.1 + # via stack-data +asyncqt==0.8.0 + # via moteus-gui +backcall==0.2.0 + # via ipython +comm==0.1.3 + # via ipykernel +contourpy==1.0.7 + # via matplotlib +cycler==0.11.0 + # via matplotlib +debugpy==1.6.7 + # via ipykernel +decorator==5.1.1 + # via ipython +executing==1.2.0 + # via stack-data +fonttools==4.39.3 + # via matplotlib +importlib-metadata==6.6.0 + # via + # jupyter-client + # moteus +importlib-resources==6.1.1 + # via matplotlib +ipykernel==6.22.0 + # via qtconsole +ipython==8.12.3 + # via ipykernel +ipython-genutils==0.2.0 + # via qtconsole +jedi==0.18.2 + # via ipython +jupyter-client==8.2.0 + # via + # ipykernel + # qtconsole +jupyter-core==5.3.0 + # via + # ipykernel + # jupyter-client + # qtconsole +kiwisolver==1.4.4 + # via matplotlib +matplotlib==3.7.1 + # via moteus-gui +matplotlib-inline==0.1.6 + # via + # ipykernel + # ipython +moteus==0.3.54 + # via + # -r requirements.in + # moteus-gui +moteus-gui==0.3.54 + # via -r requirements.in +msgpack==1.0.5 + # via python-can +nest-asyncio==1.5.6 + # via ipykernel +numpy==1.24.3 + # via + # contourpy + # matplotlib + # moteus-gui +packaging==23.1 + # via + # ipykernel + # matplotlib + # python-can + # qtconsole + # qtpy +parso==0.8.3 + # via jedi +pexpect==4.8.0 + # via ipython +pickleshare==0.7.5 + # via ipython +pillow==9.5.0 + # via matplotlib +platformdirs==3.5.0 + # via jupyter-core +prompt-toolkit==3.0.38 + # via ipython +psutil==5.9.5 + # via ipykernel +ptyprocess==0.7.0 + # via pexpect +pure-eval==0.2.2 + # via stack-data +pyelftools==0.29 + # via moteus +pygments==2.15.1 + # via + # ipython + # qtconsole +pyparsing==3.0.9 + # via matplotlib +pyserial==3.5 + # via moteus +pyside6==6.6.1 + # via moteus-gui +pyside6-addons==6.6.1 + # via pyside6 +pyside6-essentials==6.6.1 + # via + # pyside6 + # pyside6-addons +python-can==4.2.0 + # via moteus +python-dateutil==2.8.2 + # via + # jupyter-client + # matplotlib +pyzmq==25.0.2 + # via + # ipykernel + # jupyter-client + # qtconsole +qtconsole==5.4.2 + # via moteus-gui +qtpy==2.3.1 + # via + # moteus-gui + # qtconsole +shiboken6==6.6.1 + # via + # pyside6 + # pyside6-addons + # pyside6-essentials +six==1.16.0 + # via + # asttokens + # python-dateutil +stack-data==0.6.2 + # via ipython +tornado==6.3.1 + # via + # ipykernel + # jupyter-client +traitlets==5.9.0 + # via + # comm + # ipykernel + # ipython + # jupyter-client + # jupyter-core + # matplotlib-inline + # qtconsole +typing-extensions==4.5.0 + # via + # ipython + # python-can +wcwidth==0.2.6 + # via prompt-toolkit +wrapt==1.15.0 + # via python-can +zipp==3.15.0 + # via + # importlib-metadata + # importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/requirements.txt b/requirements.txt index c76e25c..00db2a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,13 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile requirement.in +# pip-compile requirements.in # +appnope==0.1.3 + # via + # ipykernel + # ipython asttokens==2.2.1 # via stack-data asyncqt==0.8.0 @@ -25,10 +29,14 @@ executing==1.2.0 fonttools==4.39.3 # via matplotlib importlib-metadata==6.6.0 - # via moteus + # via + # jupyter-client + # moteus +importlib-resources==6.1.1 + # via matplotlib ipykernel==6.22.0 # via qtconsole -ipython==8.13.2 +ipython==8.12.3 # via ipykernel ipython-genutils==0.2.0 # via qtconsole @@ -53,10 +61,10 @@ matplotlib-inline==0.1.6 # ipython moteus==0.3.54 # via - # -r requirement.in + # -r requirements.in # moteus-gui moteus-gui==0.3.54 - # via -r requirement.in + # via -r requirements.in msgpack==1.0.5 # via python-can nest-asyncio==1.5.6 @@ -101,8 +109,14 @@ pyparsing==3.0.9 # via matplotlib pyserial==3.5 # via moteus -pyside2==5.15.2.1 +pyside6==6.6.1 # via moteus-gui +pyside6-addons==6.6.1 + # via pyside6 +pyside6-essentials==6.6.1 + # via + # pyside6 + # pyside6-addons python-can==4.2.0 # via moteus python-dateutil==2.8.2 @@ -120,10 +134,15 @@ qtpy==2.3.1 # via # moteus-gui # qtconsole -shiboken2==5.15.2.1 - # via pyside2 +shiboken6==6.6.1 + # via + # pyside6 + # pyside6-addons + # pyside6-essentials six==1.16.0 - # via python-dateutil + # via + # asttokens + # python-dateutil stack-data==0.6.2 # via ipython tornado==6.3.1 @@ -140,13 +159,17 @@ traitlets==5.9.0 # matplotlib-inline # qtconsole typing-extensions==4.5.0 - # via python-can + # via + # ipython + # python-can wcwidth==0.2.6 # via prompt-toolkit wrapt==1.15.0 # via python-can zipp==3.15.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/tasks.py b/tasks.py index 11d549e..556999f 100644 --- a/tasks.py +++ b/tasks.py @@ -3,11 +3,17 @@ import sys from invoke import task + @task def sync_env(c): """Update the local virtualenv with pip-sync""" - if not os.environ.get('VIRTUAL_ENV'): + if not os.environ.get("VIRTUAL_ENV"): print("You are operating outside of a virtualenv. Skipping sync...") sys.exit(1) print("Updating your virtualenv dependencies!") c.run("pip-sync ./requirements.txt ./dev_requirements.txt") + + +@task +def start_dev(c): + c.run("python3 -m moteus_gui.tview --devices=1")