diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index e05a37b0..00000000 --- a/docs/requirements.txt +++ /dev/null @@ -1,9 +0,0 @@ -PyQt5 -sphinx -sphinxcontrib-apidoc -sphinx-codeautolink -sphinx-copybutton -sphinx-hoverxref -sphinx-rtd-theme -sphinx-toolbox -sphinx-qt-documentation diff --git a/pyproject.toml b/pyproject.toml index e1288b5e..b3aa99ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ authors = [ ] description = "Ribbon Bar for PyQt or PySide applications" readme = "README.md" -dynamic = ["version", "dependencies", "optional-dependencies"] +dynamic = ["version"] requires-python = ">=3.8" classifiers = [ "Programming Language :: Python", @@ -26,28 +26,44 @@ classifiers = [ "Operating System :: OS Independent", "Development Status :: 4 - Beta", ] +dependencies = ["numpy", "qtpy"] [project.urls] "GitHub" = "https://github.com/haiiliin/pyqtribbon" "Documentation" = "https://pyqribbon.readthedocs.io/en/stable/" +[project.optional-dependencies] +dev = [ + "coveralls", + "coverage", + "flake8", + "pytest", + "pytest-cov", + "pytest-qt", + "tox", +] +docs = [ + "PyQt5", + "sphinx", + "sphinxcontrib-apidoc", + "sphinx-codeautolink", + "sphinx-copybutton", + "sphinx-hoverxref", + "sphinx-rtd-theme", + "sphinx-toolbox", + "sphinx-qt-documentation", +] +pyqt5 = ["PyQt5"] +pyqt6 = ["PyQt6"] +pyside2 = ["PySide2"] +pyside6 = ["PySide6"] + [tool.setuptools] packages = ['pyqtribbon'] [tool.setuptools.package-data] pyqtribbon = ["icons/*", "styles/*"] -[tool.setuptools.dynamic.dependencies] -file = ["requirements/deps.txt"] - -[tool.setuptools.dynamic.optional-dependencies] -dev.file = ["requirements/dev.txt"] -docs.file = ["docs/requirements.txt"] -PyQt5.file = ["requirements/PyQt5.txt"] -PyQt6.file = ["requirements/PyQt6.txt"] -PySide2.file = ["requirements/PySide2.txt"] -PySide6.file = ["requirements/PySide6.txt"] - [tool.setuptools_scm] root = "." version_scheme = "post-release" diff --git a/requirements/PyQt5.txt b/requirements/PyQt5.txt deleted file mode 100644 index 2d07ca02..00000000 --- a/requirements/PyQt5.txt +++ /dev/null @@ -1 +0,0 @@ -PyQt5 diff --git a/requirements/PyQt6.txt b/requirements/PyQt6.txt deleted file mode 100644 index ee397a46..00000000 --- a/requirements/PyQt6.txt +++ /dev/null @@ -1 +0,0 @@ -PyQt6 diff --git a/requirements/PySide2.txt b/requirements/PySide2.txt deleted file mode 100644 index 2cea4384..00000000 --- a/requirements/PySide2.txt +++ /dev/null @@ -1,2 +0,0 @@ -PySide2; python_version < "3.11" -PySide6; python_version >= "3.11" diff --git a/requirements/PySide6.txt b/requirements/PySide6.txt deleted file mode 100644 index 7fa34f07..00000000 --- a/requirements/PySide6.txt +++ /dev/null @@ -1 +0,0 @@ -PySide6 diff --git a/requirements/deps.txt b/requirements/deps.txt deleted file mode 100644 index 09201a6c..00000000 --- a/requirements/deps.txt +++ /dev/null @@ -1,2 +0,0 @@ -numpy -qtpy diff --git a/requirements/dev.txt b/requirements/dev.txt deleted file mode 100644 index fd1ab388..00000000 --- a/requirements/dev.txt +++ /dev/null @@ -1,7 +0,0 @@ -coveralls -coverage -flake8 -pytest -pytest-cov -pytest-qt -tox diff --git a/tox.ini b/tox.ini index 04cd451c..288f6a47 100644 --- a/tox.ini +++ b/tox.ini @@ -4,9 +4,9 @@ envlist = py{38,39,310,311,312}-{PyQt5,PyQt6,PySide6} [testenv] extras = dev - PyQt5: PyQt5 - PyQt6: PyQt6 - PySide6: PySide6 + PyQt5: pyqt5 + PyQt6: pyqt6 + PySide6: pyside6 commands = pytest setenv=