Merge pull request #38 from eea/develop

Release

docs/HISTORY.txt

@@ -1,9 +1,14 @@
 Changelog
 =========
 
+4.2 - (2024-07-29)
+---------------------------
+* Change: Cleanup code comments and pdb
+  [iugin]
+
 4.1 - (2024-07-25)
 ---------------------------
-* Change: Fix: Latest eea.coremetadata release has issues - refs #273093
+* Fix: Latest eea.coremetadata release has issues - refs #273093
   [avoinea]
 
 4.0 - (2024-06-21)

eea/coremetadata/behaviors/vocabulary.py

@@ -43,54 +43,15 @@ def eea_other_organisations(context):
 def organisations_vocabulary(context):
     """organisations_vocabulary"""
 
-    # import pdb
-    # pdb.set_trace()
     return eea_other_organisations(context)
-    # vocabulary = get_vocabulary(
-    #     context, "collective.taxonomy.eeaorganisationstaxonomy"
-    # )
-
-    # terms = [
-    #     SimpleTerm(key, key, val.encode("ascii", "ignore").decode("ascii"))
-    #     for val, key in vocabulary
-    # ]
-    # # import pdb
-    # # pdb.set_trace()
-    # terms.sort(key=lambda t: t.title)
-
-    # return SimpleVocabulary(terms)
 
 
 @provider(IVocabularyFactory)
 def index_organisations_vocabulary(context):
     """index_organisations_vocabulary"""
 
-    # import pdb
-    # pdb.set_trace()
     return eea_other_organisations(context)
 
-    # catalog_values = get_catalog_values(
-    #     context, "taxonomy_eeaorganisationstaxonomy"
-    # )
-    # vocabulary = get_vocabulary(
-    #     context, "collective.taxonomy.eeaorganisationstaxonomy"
-    # )
-    # terms = []
-
-    # # import pdb
-    # # pdb.set_trace()
-    # for val, key in vocabulary:
-    #     if key in catalog_values:
-    #         terms.append(
-    #             SimpleTerm(
-    #                 key, key, val.encode("ascii", "ignore").decode("ascii")
-    #             )
-    #         )
-
-    # terms.sort(key=lambda t: t.title)
-
-    # return SimpleVocabulary(terms)
-
 
 @provider(IVocabularyFactory)
 def publisher_vocabulary(context):

eea/coremetadata/version.txt

@@ -1 +1 @@
-4.1
+4.2