From 9338190c900eaf794b69530353081e65ac311127 Mon Sep 17 00:00:00 2001 From: FiNs <24248249+FabianNiehaus@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:42:12 +0200 Subject: [PATCH 1/3] Pin setuptools-scm dependency version (#2449) --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 55c66add7fb..941236db390 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,3 @@ [options] -setup_requires = setuptools_scm +setup_requires = + setuptools_scm~=6.0.1 From e2c8bd2bc29e7dae4da4c7db63e9074edfaa34fc Mon Sep 17 00:00:00 2001 From: FiNs <24248249+FabianNiehaus@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:56:47 +0200 Subject: [PATCH 2/3] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index d28d766f4c0..19a9cd98aff 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ trailing comma (#2384) - Parsing support has been added for unparenthesized walruses in set literals, set comprehensions, and indices (#2447). +- Pin `setuptools-scm` dependency version (#2449) ### _Blackd_ From 1b232f894b4b5f6f01d7cda09d40f19181182831 Mon Sep 17 00:00:00 2001 From: Richard Si <63936253+ichard26@users.noreply.github.com> Date: Sat, 28 Aug 2021 14:24:00 -0400 Subject: [PATCH 3/3] Let's pin in pyproject.toml too Mostly since it's non-build-backend specific configuration and more widely standardized file. Not sure what benefits pinning in setup.cfg gives us on top of pyproject.toml but I'd rather not find out during the release that is supposed to happen today :wink: --- CHANGES.md | 2 +- pyproject.toml | 5 ++++- setup.cfg | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 19a9cd98aff..6c542f446e7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,7 +13,7 @@ trailing comma (#2384) - Parsing support has been added for unparenthesized walruses in set literals, set comprehensions, and indices (#2447). -- Pin `setuptools-scm` dependency version (#2449) +- Pin `setuptools-scm` build-time dependency version (#2457) ### _Blackd_ diff --git a/pyproject.toml b/pyproject.toml index d085c0ddc62..30e62974475 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,7 +23,10 @@ extend-exclude = ''' # NOTE: You don't need this in your own Black configuration. [build-system] -requires = ["setuptools>=41.0", "setuptools-scm", "wheel"] +# 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"] build-backend = "setuptools.build_meta" [tool.pytest.ini_options] diff --git a/setup.cfg b/setup.cfg index 941236db390..dbd667e8f19 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,3 @@ [options] -setup_requires = +setup_requires = setuptools_scm~=6.0.1