Fix a few issues related to "building" scons - #4737
Merged
Merged
Conversation
Typo in SConsDoc.py caused Sphinx warn. Sphinx was also issuing this notice:
Converting `source_suffix = '.rst'` to `source_suffix = {'.rst': 'restructuredtext'}`.
so updated the conf file to reflect that evolution.
Some tweaks to pyproject.toml to reflect some evolution as well.
Build was issuing this:
SetuptoolsDeprecationWarning: `project.license` as a TOML table is deprecated
!!
Please use a simple string containing a SPDX expression for `project.license`.
You can also use `project.license-files`. (Both options available on setuptools>=77.0.0).
Plus, License in Classifiers is deprecated, as is license-files in
the [tool.setuptools] section (which moves to the package section.
Improved, I hope, the package-finder specification.
Added optional dependencies section to match the external
requirement-dev.txt and requirements-pkg.txt files. This is supposed
to allow installing "in one go", like (currently untested):
python -m pip install scons[dev]
Signed-off-by: Mats Wichmann <mats@linux.com>
mwichmann
added
the
Release
Got the version syntax for lxml wrong first time. Signed-off-by: Mats Wichmann <mats@linux.com>
bdbaddog
changed the title
bdbaddog
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Typo in
SConsDoc.pycaused Sphinx warn. Sphinx was also issuing this notice:so updated the conf file to reflect that evolution.
Some tweaks to
pyproject.tomlto reflect some evolution as well. Build was issuing this:Plus,
LicenseinClassifiersis deprecated, as islicense-filesin the[tool.setuptools]section (now it's supposed to be inproject.license-files, as it's not a setuptools-specific thing any longer).Improved, I hope, the package-finder specification.
Added optional dependencies section to match the external
requirement-dev.txtandrequirements-pkg.txtfiles. This is supposed to allow installing "in one go", like (currently untested):With one exception, this should produce an identical package build to previously, but without the complaints issued by recent setuptools. The exception is the addition of the license file for docbook-xsl in the package metadata
licensesdirectory, as current packaging standards mandate (likescons-4.9.1.dist-info/licenses/SCons/Tool/docbook/docbook-xsl-1.76.1/COPYING). We could roll this back out, since that file was actually included in its original path already, but not flagged as a license file, just a data file; we could also store it in a more logical place - an example was to put licenses for vendored components in a subdirectoryvendor(or similar name).