Merge branch 'release-0.3.1'

* release-0.3.1:
  Update docs.
  Update requirements.
  Update docs to version 0.3.1
  Fix dict_to_thing (#81)

CHANGES.rst

@@ -1,3 +1,9 @@
+0.3.1 (2020-02-19)
+------------------
+
+- Fix a bug in `dict_to_thing` that resulted in the provider exposing objects
+  instead of id's in relations. (#80)
+
 0.3.0 (2020-01-24)
 ------------------
 

docs/source/api.rst

@@ -15,3 +15,9 @@ Utils module
 
 .. automodule:: skosprovider_atramhasis.utils
    :members:
+
+Cache_utils module
+------------------
+
+.. automodule:: skosprovider_atramhasis.cache_utils
+   :members:

docs/source/conf.py

@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '0.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.0'
+release = '0.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

requirements-dev.txt

@@ -3,12 +3,12 @@
 
 # Documentation
 Sphinx==1.8.5 ; python_version < '3.5'
-Sphinx==2.2.0 ; python_version >= '3.5'
+Sphinx==2.4.2 ; python_version >= '3.5'
 
 # Unit testing
-tox==3.14.0
-pytest==4.6.6 ; python_version < '3.0'
-pytest==5.2.1 ; python_version >= '3.0'
-responses==0.10.6
+tox==3.14.5
+pytest==4.6.9 ; python_version < '3.0'
+pytest==5.3.5 ; python_version >= '3.0'
+responses==0.10.9
 pytest-cov==2.8.1
-coveralls==1.8.2
+coveralls==1.11.1

requirements.txt

@@ -1,4 +1,4 @@
-requests==2.22.0
+requests==2.23.0
 skosprovider==0.7.0
 # -e git+https://github.com/koenedaele/skosprovider.git@DEV_0.7.0#egg=skosprovider
 dogpile.cache==0.9.0

setup.py

@@ -18,7 +18,7 @@
 ]
 setup(
     name='skosprovider_atramhasis',
-    version='0.3.0',
+    version='0.3.1',
     description='Skosprovider implementation of Atramhasis Vocabularies',
     long_description=README,
     long_description_content_type='text/x-rst',

skosprovider_atramhasis/cache_utils.py

@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
+'''
+Utility functions for chaching in :mod:`skosprovider_atramhasis`.
+'''
+
 import functools
 import json
 

skosprovider_atramhasis/utils.py

@@ -32,10 +32,10 @@ def text_(s, encoding='latin-1', errors='strict'):
 def dict_to_thing(dict):
     '''
     Transform a dict into a
-    :class:`Concept` or :class:`Collection` .
+    :class:`skosprovider.skos.Concept` or :class:`skosprovider.skos.Collection` .
 
-    If the argument passed is already a :class:`Concept` or :class:`Collection`, this method just
-    returns the argument.
+    If the argument passed is already a :class:`skosprovider.skos.Concept` or
+    :class:`skosprovider.skos.Collection`, this method just returns the argument.
     '''
     if isinstance(dict, Concept) or isinstance(dict, Collection):
         return dict
@@ -53,7 +53,7 @@ def dict_to_thing(dict):
         if type == 'concept':
             thing = Concept(id)
             if 'subordinate_arrays' in dict:
-                thing.subordinate_arrays = [(dict_to_thing(n)) for n in dict['subordinate_arrays']]
+                thing.subordinate_arrays = [n['id'] for n in dict['subordinate_arrays']]
             if 'matches' in dict:
                 matches = dict['matches']
                 for match_type in thing.matchtypes:
@@ -62,9 +62,9 @@ def dict_to_thing(dict):
         elif type == 'collection':
             thing = Collection(id)
             if 'superordinates' in dict:
-                thing.superordinates = [(dict_to_thing(n)) for n in dict['superordinates']]
+                thing.superordinates = [n['id'] for n in dict['superordinates']]
             if 'members' in dict:
-                thing.members = [(dict_to_thing(n)) for n in dict['members']]
+                thing.members = [n['id'] for n in dict['members']]
         else:
             raise ValueError("type: type is not valid ('concept', 'collection') in dict")
         thing.type = type
@@ -77,13 +77,11 @@ def dict_to_thing(dict):
         if 'sources' in dict:
             thing.sources = [(dict_to_source(n)) for n in dict['sources']]
         if 'narrower' in dict:
-            thing.narrower = [(dict_to_thing(n)) for n in dict['narrower']]
+            thing.narrower = [n['id'] for n in dict['narrower']]
         if 'broader' in dict:
-            thing.broader = [(dict_to_thing(n)) for n in dict['broader']]
+            thing.broader = [n['id'] for n in dict['broader']]
         if 'related' in dict:
-            thing.related = [(dict_to_thing(n)) for n in dict['related']]
+            thing.related = [n['id'] for n in dict['related']]
         if 'member_of' in dict:
-            thing.member_of = [(dict_to_thing(n)) for n in dict['member_of']]
+            thing.member_of = [n['id'] for n in dict['member_of']]
         return thing
-
-

tests/test_providers.py

@@ -221,6 +221,8 @@ def test_get_by_id_concept(self):
         assert concept.type == 'concept'
         assert len(concept.labels) > 0
         assert 'traditioneel' in [l.label for l in concept.labels if l.type == 'prefLabel']
+        assert 2 in concept.narrower
+        assert 60 in concept.member_of
 
     @responses.activate
     def test_get_by_id_concept_matches(self):
@@ -234,6 +236,7 @@ def test_get_by_id_concept_matches(self):
         assert concept.type == 'concept'
         assert len(concept.labels) > 0
         assert 'The Chestnut' in [l.label for l in concept.labels if l.type == 'prefLabel']
+        assert 3 in concept.member_of
 
     @responses.activate
     def test_get_by_id_nonexistant_id(self):