Skip to content

Commit 12fc28e

Browse files
committed
Updated more references to the legacy name in Python code.
1 parent d0daf6f commit 12fc28e

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

src/setuptools_scm/_cli.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def _get_cli_opts(args: list[str] | None) -> argparse.Namespace:
6161
"--config",
6262
default=None,
6363
metavar="PATH",
64-
help="path to 'pyproject.toml' with setuptools_scm config, "
64+
help="path to 'pyproject.toml' with setuptools-scm config, "
6565
"default: looked up in the current or parent directories",
6666
)
6767
parser.add_argument(
@@ -89,7 +89,7 @@ def _get_cli_opts(args: list[str] | None) -> argparse.Namespace:
8989
"--query",
9090
type=str.casefold,
9191
nargs="*",
92-
help="display setuptools_scm settings according to query, "
92+
help="display setuptools-scm settings according to query, "
9393
"e.g. dist_name, do not supply an argument in order to "
9494
"print a list of valid queries.",
9595
)

src/setuptools_scm/_get_version_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def get_version(
149149
"""
150150
If supplied, relative_to should be a file from which root may
151151
be resolved. Typically called by a script or module that is not
152-
in the root of the repository to direct setuptools_scm to the
152+
in the root of the repository to direct setuptools-scm to the
153153
root of the repository by supplying ``__file__``.
154154
"""
155155

src/setuptools_scm/_integration/dump_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
TEMPLATES = {
1515
".py": """\
16-
# file generated by setuptools_scm
16+
# file generated by setuptools-scm
1717
# don't change, don't track in version control
1818
TYPE_CHECKING = False
1919
if TYPE_CHECKING:

src/setuptools_scm/_integration/setuptools.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ def _warn_on_old_setuptools(_version: str = setuptools.__version__) -> None:
3131
warnings.warn(
3232
RuntimeWarning(
3333
f"""
34-
ERROR: setuptools=={_version} is used in combination with setuptools_scm>=8.x
34+
ERROR: setuptools=={_version} is used in combination with setuptools-scm>=8.x
3535
3636
Your build configuration is incomplete and previously worked by accident!
37-
setuptools_scm requires setuptools>=61
37+
setuptools-scm requires setuptools>=61
3838
3939
Suggested workaround if applicable:
4040
- migrating from the deprecated setup_requires mechanism to pep517/518
@@ -113,7 +113,7 @@ def infer_version(dist: setuptools.Distribution) -> None:
113113
dist_name = read_dist_name_from_setup_cfg()
114114
if not os.path.isfile("pyproject.toml"):
115115
return
116-
if dist_name == "setuptools_scm":
116+
if dist_name == "setuptools-scm":
117117
return
118118
try:
119119
config = _config.Configuration.from_file(dist_name=dist_name)

testing/test_git.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_git_gone(wd: WorkDir, monkeypatch: pytest.MonkeyPatch) -> None:
107107
assert wd.get_version(fallback_version="1.0") == "1.0"
108108

109109

110-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/298")
110+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/298")
111111
@pytest.mark.issue(403)
112112
def test_file_finder_no_history(wd: WorkDir, caplog: pytest.LogCaptureFixture) -> None:
113113
file_list = git_find_files(str(wd.cwd))
@@ -116,7 +116,7 @@ def test_file_finder_no_history(wd: WorkDir, caplog: pytest.LogCaptureFixture) -
116116
assert "listing git files failed - pretending there aren't any" in caplog.text
117117

118118

119-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/281")
119+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/281")
120120
def test_parse_call_order(wd: WorkDir) -> None:
121121
git.parse(str(wd.cwd), Configuration(), git.DEFAULT_DESCRIBE)
122122

@@ -153,7 +153,7 @@ def break_folder_permissions(path: Path) -> Generator[None, None, None]:
153153
sudo_devnull(["chgrp", "-R", str(original_stat.st_gid), path], check=True)
154154

155155

156-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/707")
156+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/707")
157157
def test_not_owner(wd: WorkDir) -> None:
158158
with break_folder_permissions(wd.cwd):
159159
assert git.parse(str(wd.cwd), Configuration())
@@ -401,7 +401,7 @@ def test_git_archive_run_from_subdirectory(
401401
assert setuptools_scm._file_finders.find_files(".") == [opj(".", "test1.txt")]
402402

403403

404-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/728")
404+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/728")
405405
def test_git_branch_names_correct(wd: WorkDir) -> None:
406406
wd.commit_testfile()
407407
wd("git checkout -b test/fun")
@@ -419,7 +419,7 @@ def test_git_feature_branch_increments_major(wd: WorkDir) -> None:
419419
assert wd.get_version(version_scheme="python-simplified-semver").startswith("1.1.0")
420420

421421

422-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/303")
422+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/303")
423423
def test_not_matching_tags(wd: WorkDir) -> None:
424424
wd.commit_testfile()
425425
wd("git tag apache-arrow-0.11.1")
@@ -432,7 +432,7 @@ def test_not_matching_tags(wd: WorkDir) -> None:
432432
).startswith("0.11.2")
433433

434434

435-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/411")
435+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/411")
436436
def test_non_dotted_version(wd: WorkDir) -> None:
437437
wd.commit_testfile()
438438
wd("git tag apache-arrow-1")
@@ -456,12 +456,12 @@ def test_non_dotted_tag_no_version_match(wd: WorkDir) -> None:
456456
assert wd.get_version().startswith("0.11.2.dev2")
457457

458458

459-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/381")
459+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/381")
460460
def test_gitdir(monkeypatch: pytest.MonkeyPatch, wd: WorkDir) -> None:
461461
""" """
462462
wd.commit_testfile()
463463
normal = wd.get_version()
464-
# git hooks set this and break subsequent setuptools_scm unless we clean
464+
# git hooks set this and break subsequent setuptools-scm unless we clean
465465
monkeypatch.setenv("GIT_DIR", __file__)
466466
assert wd.get_version() == normal
467467

@@ -540,7 +540,7 @@ def signed_commit_wd(monkeypatch: pytest.MonkeyPatch, wd: WorkDir) -> WorkDir:
540540
return wd
541541

542542

543-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/548")
543+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/548")
544544
def test_git_getdate_signed_commit(signed_commit_wd: WorkDir) -> None:
545545
today = datetime.now(timezone.utc).date()
546546
signed_commit_wd.commit_testfile(signed=True)
@@ -578,7 +578,7 @@ def test_git_archival_to_version(expected: str, from_data: dict[str, str]) -> No
578578
assert format_version(version) == expected
579579

580580

581-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/727")
581+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/727")
582582
def test_git_archival_node_missing_no_version() -> None:
583583
config = Configuration()
584584
version = archival_to_version({}, config=config)

testing/test_mercurial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def test_version_bump_from_commit_including_hgtag_mods(wd: WorkDir) -> None:
201201
@pytest.mark.usefixtures("version_1_0")
202202
def test_latest_tag_detection(wd: WorkDir) -> None:
203203
"""Tests that tags not containing a "." are ignored, the same as for git.
204-
Note that will be superseded by the fix for pypa/setuptools_scm/issues/235
204+
Note that will be superseded by the fix for pypa/setuptools-scm/issues/235
205205
"""
206206
wd('hg tag some-random-tag -u test -d "0 0"')
207207
assert wd.get_version() == "1.0.0"

testing/test_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def test_tag_regex1(tag: str, expected: str) -> None:
221221
assert result.tag.public == expected
222222

223223

224-
@pytest.mark.issue("https://github.com/pypa/setuptools_scm/issues/471")
224+
@pytest.mark.issue("https://github.com/pypa/setuptools-scm/issues/471")
225225
def test_version_bump_bad() -> None:
226226
class YikesVersion:
227227
val: str

0 commit comments

Comments
 (0)