Merge branch 'master' of https://github.com/cldf/pycldf

Author: xrotwang

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 The `pycldf` package adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## unreleased
+
+- Switch from `pybtex` to `simplepybtex`.
+- Make `Dataset.add_sources` accept a `BibliographyData` object from either `pybtex` or `simplepybtex`.
+- More informative error message when `Dataset.add_sources` gets the wrong type of object.
 
 ## [1.42.0] - 2025-04-07
 

setup.cfg

@@ -41,9 +41,7 @@ install_requires =
     clldutils>=3.9
     uritemplate>=3.0
     python-dateutil
-    # pybtex requires setuptools, but doesn't seem to declare this.
-    setuptools
-    pybtex
+    simplepybtex
     newick
     commonnexus>=1.2.0
     python-frontmatter

src/pycldf/sources.py

@@ -58,10 +58,10 @@ def __repr__(self):
     @classmethod
     def from_entry(cls, key, entry, **_kw):
         """
-        Create a `cls` instance from a `pybtex` entry object.
+        Create a `cls` instance from a `simplepybtex` entry object.
 
         :param key: BibTeX citation key of the entry
-        :param entry: `pybtex.database.Entry` instance
+        :param entry: `simplepybtex.database.Entry` instance
         :param _kw: Non-bib-metadata keywords to be passed for `cls` instantiation
         :return: `cls` instance
         """
@@ -220,10 +220,15 @@ def expand_refs(self, refs: typing.Iterable[str], **kw) -> typing.Iterable[Refer
     def _add_entries(self, data, **kw):
         if isinstance(data, Source):
             entries = [(data.id, data.entry)]
-        elif isinstance(data, database.BibliographyData):
+        elif hasattr(data, 'entries'):
             entries = data.entries.items()
         else:
-            raise ValueError(data)
+            msg = (
+                'expected `clldutils.source.Source`,'
+                ' `pybtex.database.BibliographyData`,'
+                ' or `simplepybtex.database.BibliographyData`;'
+                f' got {type(data)}')
+            raise TypeError(data)
 
         for key, entry in entries:
             if kw.get('_check_id', False) and not ID_PATTERN.match(key):

tests/test_sources.py

@@ -74,7 +74,7 @@ def test_Sources(bib):
     refs = ['huber2005[1-6]', 'Obrazy', 'Elegie[34]']
     assert src.format_refs(*list(src.expand_refs(refs))) == refs
     assert '%s' % src['huber2005'] == 'Huber, Herrmann. 2005. y.'
-    with pytest.raises(ValueError):
+    with pytest.raises(TypeError):
         src.add(5)
 
     with pytest.raises(ValueError):