Merge pull request #99 from cldf/simplepybtex

switch to simplepybtex and pull it in explicitly

Author: johenglisch

.github/workflows/python-package.yml

@@ -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

setup.cfg

@@ -45,6 +45,7 @@ install_requires =
     appdirs
     pytest
     zenodoclient>=0.3
+    simplepybtex
     tqdm
 
 include_package_data = True

src/cldfbench/datadir.py

@@ -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
@@ -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,

tests/test_cli.py

@@ -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)])