Merge branch 'cahytinne-master'

* cahytinne-master:
  Update HISTORY.
  Add markup attribute to skos note #16

HISTORY.rst

@@ -1,3 +1,13 @@
+0.5.0 (2015-??-??)
+------------------
+
+* Update to skosprovider 0.6.0
+* Due to the update to skosprovider 0.6.0, a new field `markup`, was added to a 
+  :class:`skosprovider_sqlalchemy.models.Note`. When upgrading from a previous
+  version of `skosprovider_sqlalchemy`, any databases created in that previous
+  verions will need to be updated as well. Please add a field called `markup` 
+  to the `note` table.
+
 0.4.2 (2015-03-02)
 ------------------
 

requirements.txt

@@ -1,2 +1,2 @@
 SQLAlchemy==0.9.8
-skosprovider==0.4.2
+-e git+https://github.com/koenedaele/skosprovider.git#egg=skosprovider

skosprovider_sqlalchemy/models.py

@@ -412,11 +412,13 @@ class Note(Base):
         nullable=True,
         index=True
     )
+    markup = Column(String(20), nullable=True)
 
-    def __init__(self, note, notetype_id, language_id):
+    def __init__(self, note, notetype_id, language_id, markup=None):
         self.notetype_id = notetype_id
         self.language_id = language_id
         self.note = note
+        self.markup = markup
 
     def __str__(self):
         return self.note

skosprovider_sqlalchemy/providers.py

@@ -114,7 +114,7 @@ def _get_concept_scheme(self):
                 for l in csm.labels
             ],
             notes=[
-                Note(n.note, n.notetype_id, n.language_id)
+                Note(n.note, n.notetype_id, n.language_id, n.markup)
                 for n in csm.notes
             ]
         )
@@ -136,7 +136,7 @@ def _from_thing(self, thing):
                     for l in thing.labels
                 ],
                 notes=[
-                    Note(n.note, n.notetype_id, n.language_id)
+                    Note(n.note, n.notetype_id, n.language_id, n.markup)
                     for n in thing.notes
                 ],
                 members=[member.concept_id for member in thing.members] if hasattr(thing, 'members') else [],
@@ -159,7 +159,7 @@ def _from_thing(self, thing):
                     for l in thing.labels
                 ],
                 notes=[
-                    Note(n.note, n.notetype_id, n.language_id)
+                    Note(n.note, n.notetype_id, n.language_id, n.markup)
                     for n in thing.notes
                 ],
                 broader=[c.concept_id for c in thing.broader_concepts],

tests/test_models.py

@@ -239,11 +239,13 @@ def test_simple(self):
         n = self._get_target_class()(
             'Een kerk is een religieus gebouw.',
             'definition',
-            'nl'
+            'nl',
+            'HTML'
         )
         assert 'nl' == n.language_id
         assert 'definition' == n.notetype_id
         assert 'Een kerk is een religieus gebouw.' == n.__str__()
+        assert 'HTML' == n.markup
 
     def test_load_objects(self):
         n = self._get_target_class()(
@@ -255,6 +257,7 @@ def test_load_objects(self):
         self.session.flush()
         assert 'Dutch' == n.language.name
         assert 'definition' == n.notetype.name
+        assert None == n.markup
 
     def test_no_language(self):
         n = self._get_target_class()(
@@ -269,6 +272,7 @@ def test_no_language(self):
         self.session.flush()
         assert None == n.language
         assert 'definition' == n.notetype.name
+        assert None == n.markup
 
 
 class LanguageTests(ModelTestCase):