Skip to content
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

Jump to bottom

fix(config): read using utf-8 #1002

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

fix(config): read using utf-8 #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
781bbb3
Enforce use of utf-8 in pyproject.toml
AmaseCocoa Aug 9, 2024
0b11327
Merge branch 'RobertCraigie:main' into fix-cp932-error
AmaseCocoa Aug 9, 2024
9cf36fa
Added test if pyproject.toml exists
AmaseCocoa Aug 9, 2024
f2dba87
chore(pre-commit.ci): auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 9, 2024
872281a
Fix mistake where home_dir was prisma_version
AmaseCocoa Aug 9, 2024
f799bfb
Change to prisma_version instead of home_dir
AmaseCocoa Aug 9, 2024
c955b1c
Merge branch 'RobertCraigie:main' into fix-cp932-error
AmaseCocoa Aug 10, 2024
2a3a168
Merge branch 'RobertCraigie:main' into fix-cp932-error
AmaseCocoa Aug 21, 2024
36f6cd1
Merge branch 'RobertCraigie:main' into fix-cp932-error
AmaseCocoa Sep 11, 2024
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 src/prisma/_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def load(cls, path: Path | None = None) -> Config:
path = Path('pyproject.toml')

if path.exists():
config = tomlkit.loads(path.read_text()).get('tool', {}).get('prisma', {})
config = tomlkit.loads(path.read_text(encoding='utf-8')).get('tool', {}).get('prisma', {})
else:
config = {}

Expand Down
18 changes: 18 additions & 0 deletions tests/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,24 @@ def test_no_file(testdir: Testdir) -> None:
assert isinstance(config.prisma_version, str)


def test_with_file(testdir: Testdir) -> None:
"""Can works config from pyproject.toml successfully"""
path = Path('pyproject.toml')
testdir.makefile(
'.toml',
pyproject=dedent(
"""
[tool.prisma]
prisma_version = '0.1.2.3'
"""
),
)

assert path.exists()
config = Config.load(path)
assert config.prisma_version == '0.1.2.3'


def test_loading(testdir: Testdir) -> None:
"""Config loading overrides defaults"""
testdir.makefile(
Expand Down