Skip to content

Commit

Permalink
Fix missing toml extra w/ setuptools-scm (GH-2475)
Browse files Browse the repository at this point in the history
Project packaging is using TOML due to pyproject.toml but fails to
mention it, causing installation failures with newer setuptools-scm 6.3.0.

Commit history before merge:

* Fix missing toml extra

Fixed breakage uncovered by setuptools-scm 6.3.0 where installation
would fail for project that missed to mention the toml extra.

* Bump setuptools[-scm] to avoid toml extra

#2475 (comment)

> If you constraint greater than 6.3.0 and setuptools greater than 45
> you can skip the extra,

* Actually for safety reasons, just use the extra

Co-authored-by: Richard Si <63936253+ichard26@users.noreply.github.com>
  • Loading branch information
ssbarnea and ichard26 committed Sep 6, 2021
1 parent 8b0c7bc commit 41e6700
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -5,6 +5,7 @@
### Packaging

- Fix missing modules in self-contained binaries (#2466)
- Fix missing toml extra used during installation (#2475)

## 21.8b0

Expand Down
5 changes: 1 addition & 4 deletions pyproject.toml
Expand Up @@ -23,10 +23,7 @@ extend-exclude = '''
# NOTE: You don't need this in your own Black configuration.

[build-system]
# We're pinning setuptools-scm to bugfix versions only because for build-time
# deps having them work on install by default is really important. Especially
# since it's hard for users to work-around the specified build requirements.
requires = ["setuptools>=41.0", "setuptools_scm~=6.0.1", "wheel"]
requires = ["setuptools>=45.0", "setuptools_scm[toml]>=6.3.1", "wheel"]
build-backend = "setuptools.build_meta"

[tool.pytest.ini_options]
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
@@ -1,3 +1,3 @@
[options]
setup_requires =
setuptools_scm~=6.0.1
setuptools_scm[toml]>=6.3.1

0 comments on commit 41e6700

Please sign in to comment.