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

Set character encoding explicitly in JSONStore #134

Merged
merged 3 commits into from
May 15, 2024
Merged

Set character encoding explicitly in JSONStore #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
634182b
Set character encoding explicitly in JSONStore
rkingsbury May 15, 2024
37ccf9c
Merge branch 'main' into bugfix
rkingsbury May 15, 2024
3ae9a6e
fix CHANGELOG
rkingsbury May 15, 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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Fixed

- `UnicodeDecodeError` when trying to connect to ion database on non-English platforms ([#122](https://github.com/KingsburyLab/pyEQL/issues/122))

### Changed

- Docs: Fix missing close parentheses in docstring (@Andrew S. Rosen)

## [1.0.0] - 2024-03-17

### Added
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ install_requires =
pymatgen>=2023.10.11
iapws
monty
maggma>=0.57.5
maggma>=0.67.0
phreeqpython

[options.packages.find]
Expand Down
2 changes: 1 addition & 1 deletion src/pyEQL/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

# create a Store for the default database
json_db_file = files("pyEQL") / "database" / "pyeql_db.json"
IonDB = JSONStore(str(json_db_file), key="formula")
IonDB = JSONStore(str(json_db_file), key="formula", encoding="utf8")
# By calling connect on init, we get the expensive JSON reading operation out
# of the way. Subsequent calls to connect will bypass this and access the already-
# instantiated Store in memory, which should speed up instantiation of Solution objects.
Expand Down
Loading