Skip to content

Commit

Permalink
remove need for requirements_optional.txt
Browse files Browse the repository at this point in the history
Move the documentation related packages to requirements_doc.txt, and the other optional packages are now part of the regular requirements.txt file.  The wheel build option to include additional packages is really not needed.

If using the allOptPkg flag now the documentation related packages are installed
  • Loading branch information
schaubh committed Dec 11, 2024
1 parent 03e8f89 commit a231ed4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def system_requirements(self):

checkStr = "Required"
if self.options.get_safe("allOptPkg"):
optFile = open('requirements_optional.txt', 'r')
optFile = open('requirements_doc.txt', 'r')
optionalPkgs = optFile.read().replace("`", "").split('\n')
optFile.close()
optionalPkgs = [x.lower() for x in optionalPkgs]
Expand Down
6 changes: 1 addition & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ requires = [

[project]
name = 'Basilisk'
dynamic = ["version", "dependencies", "optional-dependencies"]
dynamic = ["version", "dependencies"]
requires-python = ">=3.8, <3.12"

readme = "README.md"
Expand Down Expand Up @@ -51,7 +51,3 @@ Basilisk = [
[tool.setuptools.dynamic]
version = {file = "docs/source/bskVersion.txt"}
dependencies = {file = "requirements.txt"}

[tool.setuptools.dynamic.optional-dependencies]
# TODO: Group optional requirements appropriately, e.g. "test", "docs"
optional = {file = "requirements_optional.txt"}
3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ colorama
tqdm
Pillow
requests
bokeh
dask-expr
protobuf==5.27.0
3 changes: 0 additions & 3 deletions requirements_optional.txt → requirements_doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@ docutils
recommonmark
sphinx>7.0.0
sphinx_rtd_theme>=3.0.0
bokeh
dask-expr
protobuf==5.27.0

0 comments on commit a231ed4

Please sign in to comment.