Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/pyunity/pyunity into dev…
Browse files Browse the repository at this point in the history
…elop
  • Loading branch information
rayzchen committed Jul 27, 2023
2 parents 6fb5aa8 + bbbb68c commit 16070b7
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 14 deletions.
38 changes: 30 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,46 @@ accel = [
"pyopengl-accelerate",
"numpy",
]
build = [
"wheel>=0.29.0",
"cython>=3.0.0",
"setuptools>=58.6.0",
"build[virtualenv]>=0.9.0",
]
test = [
"autopep8",
"pytest>=6.0",
"pytest-cov>=2.0",
"mypy>=1.4.0",
]
fallback = [
"toml",
"importlib-metadata",
]
dev = [
# providers
"glfw",
"glcontext",
# docs
"sphinx>=5.0.0",
"sphinx-toolbox>=1.1.0",
"sphinx-hoverxref>=1.1.1",
# accel
"pyopengl-accelerate",
"numpy",
"toml",
# build
"wheel>=0.29.0",
"cython>=3.0.0",
"setuptools>=58.6.0",
"build[virtualenv]>=0.9.0",
# test
"autopep8",
"pytest>=6.0",
"pytest-cov>=2.0",
"mypy>=1.4.0",
# fallback
"toml",
"importlib-metadata",
"wheel>=0.29.0",
"cython>=3.0.0",
"setuptools>=58.6.0",
"build[virtualenv]>=0.9.0",
"sphinx>=5.0.0",
"sphinx-toolbox>=1.1.0",
"sphinx-hoverxref>=1.1.1",
]

[tool.setuptools]
Expand Down
11 changes: 5 additions & 6 deletions pyunity/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,10 @@ def getReqsFromToml(version):
def pruneReqs(reqs):
"""
Prune the requirements dict retrieved by ``getReqsFrom*``
functions. Removes sections with no requirements found,
and removes the ``dev`` section if there are any missing
requirements. This helps reduce the output of ``getInfo``,
since ``[dev]`` is a list of requirements which include
most other sections.
functions. Removes the ``dev`` section if found and
removes sections with no requirements found. This helps
reduce the output of ``getInfo``, since ``[dev]`` is a
list of requirements which include most other sections.
Parameters
----------
Expand All @@ -178,7 +177,7 @@ def pruneReqs(reqs):
if all(x[1] is None for x in reqs[section]):
removed.add(section)

if "dev" in reqs and any(x[1] is None for x in reqs[section]):
if "dev" in reqs:
removed.add("dev")

for section in removed:
Expand Down

0 comments on commit 16070b7

Please sign in to comment.