Skip to content

open setup.py as utf-8 in get_requires_python_str #977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mayeut merged 5 commits into from
Dec 30, 2021
Merged

open setup.py as utf-8 in get_requires_python_str #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35a66e0
open setup.py as utf-8 in get_requires_python_str
fgregg Dec 29, 2021
a109b71
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 29, 2021
217b8bd
update test for UTF-8 setup.py
mayeut Dec 29, 2021
1406037
Update projectfiles_test.py
mayeut Dec 29, 2021
b9c8a11
fix test
mayeut Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cibuildwheel/projectfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def get_requires_python_str(package_dir: Path) -> Optional[str]:
pass

try:
with (package_dir / "setup.py").open() as f2:
with (package_dir / "setup.py").open(encoding="utf8") as f2:
return setup_py_python_requires(f2.read())
except FileNotFoundError:
pass
Expand Down
7 changes: 5 additions & 2 deletions unit_test/projectfiles_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test_read_setup_py_simple(tmp_path):


def test_read_setup_py_full(tmp_path):
with open(tmp_path / "setup.py", "w") as f:
with open(tmp_path / "setup.py", "w", encoding="utf8") as f:
f.write(
dedent(
"""
Expand All @@ -35,6 +35,7 @@ def test_read_setup_py_full(tmp_path):

setuptools.setup(
name = "hello",
description = "≥“”ü",
other = 23,
example = ["item", "other"],
python_requires = "1.24",
Expand All @@ -43,7 +44,9 @@ def test_read_setup_py_full(tmp_path):
)
)

assert setup_py_python_requires(tmp_path.joinpath("setup.py").read_text()) == "1.24"
assert (
setup_py_python_requires(tmp_path.joinpath("setup.py").read_text(encoding="utf8")) == "1.24"
)
assert get_requires_python_str(tmp_path) == "1.24"


Expand Down