Skip to content

switch to simplepybtex and pull it in explicitly #99

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
johenglisch merged 2 commits into from
Aug 7, 2025
Merged

switch to simplepybtex and pull it in explicitly #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1cde49
switch to simplepybtex and pull it in explicitly
johenglisch Aug 6, 2025
d70c80e
fixed test
johenglisch Aug 6, 2025
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 .github/workflows/python-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9, "3.10", 3.11, 3.12]
python-version: [3.9, "3.10", 3.11, 3.12, 3.13]

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ install_requires =
appdirs
pytest
zenodoclient>=0.3
simplepybtex
tqdm

include_package_data = True
Expand Down
4 changes: 2 additions & 2 deletions src/cldfbench/datadir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
except ImportError: # pragma: no cover
openpyxl = None

import pybtex.database
import simplepybtex.database
from csvw import dsv
from clldutils.misc import xmlchars, slug
from clldutils.path import TemporaryDirectory
Expand Down Expand Up @@ -206,7 +206,7 @@ def read_json(self,

def read_bib(self,
fname: typing.Union[str, pathlib.Path] = 'sources.bib') -> typing.List[Source]:
bib = pybtex.database.parse_string(self.read(fname), bib_format='bibtex')
bib = simplepybtex.database.parse_string(self.read(fname), bib_format='bibtex')
return [Source.from_entry(k, e) for k, e in bib.entries.items()]

def ods2csv(self,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def test_catalog_from_config(glottolog_dir, tmpds, mocker, tmp_path, fixtures_di

# First case: get a "good" value from comfig:
mocker.patch(
'cldfcatalog.config.appdirs',
'cldfcatalog.config.platformdirs',
mocker.Mock(user_config_dir=mocker.Mock(return_value=str(tmp_path))))
mocker.patch('cldfbench.commands.catconfig.confirm', mocker.Mock(return_value=False))
cli.main(['catconfig', '--glottolog', str(glottolog_dir)])
Expand Down