diff --git a/setup.py b/setup.py index 17d9096..214d9a6 100644 --- a/setup.py +++ b/setup.py @@ -729,6 +729,39 @@ def data_files(root_directory): with open("README.md", 'r') as f: description = f.read() +dependencies=[ + "gltflib", + "glue-core", + "glue-vispy-viewers", + "pillow", + "PyMCubes", + "usd-core", +] + +extras_require = { + "test": [ + "flake8", + "pytest", + "pytest-cov", + ], + "qt": [ + "glue-qt", + "PyQt5", + ], + "jupyter": [ + "glue-jupyter", + "ipyfilechooser", + "ipyvuetify", + "glue-vispy-viewers[jupyter]", + ], + "qr": [ + "ngrok", + "segno", + ] +} + +extras_require["all"] = sum(extras_require.values(), []) + # TODO: Add the rest of the package data setup_args = dict( name=name, @@ -742,35 +775,8 @@ def data_files(root_directory): "glue_ar": ["py.typed", "resources/**", "**/*.vue", "**/*.ui"], }, include_package_data=True, - install_requires=[ - "gltflib", - "glue-core", - "glue-vispy-viewers", - "pillow", - "PyMCubes", - "usd-core", - ], - extras_require={ - "test": [ - "flake8", - "pytest", - "pytest-cov", - ], - "qt": [ - "glue-qt", - "PyQt5", - ], - "jupyter": [ - "glue-jupyter", - "ipyfilechooser", - "ipyvuetify", - "glue-vispy-viewers[jupyter]", - ], - "qr": [ - "ngrok", - "segno", - ] - }, + install_requires=dependencies, + extras_require=extras_require, entry_points={ "glue.plugins": "glue_ar = glue_ar:setup" } diff --git a/tox.ini b/tox.ini index b1e7caa..46b50dc 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ changedir = test: .tmp/{envname} extras = test: test - all: qt,jupyter + all: all qt: qt jupyter: jupyter commands =