deprecation warnings

Author: lbesson

c2corg_api/ext/sqa_view.py

@@ -16,7 +16,7 @@ def view(name, schema, metadata, selectable):
     # created
     t = Table(name, MetaData(), schema=schema)
 
-    for c in selectable.c:
+    for c in selectable.subquery().c:
         t.append_column(Column(c.name, c.type, primary_key=c.primary_key))
 
     return t

c2corg_api/markdown/toc.py

@@ -16,7 +16,7 @@
 
 from markdown.util import code_escape
 from markdown.extensions.toc import (TocExtension, TocTreeprocessor,
-                                     stashedHTML2text, unescape,
+                                     run_postprocessors, strip_tags, unescape,
                                      unique, nest_toc_tokens,
                                      AtomicString, html)
 
@@ -75,16 +75,17 @@ def run(self, doc):
 
                 # Do not override pre-existing ids
                 if "id" not in el.attrib:
-                    innertext = unescape(stashedHTML2text(text, self.md))
+                    innertext = strip_tags(run_postprocessors(unescape(text), self.md))  # noqa: E501
                     el.attrib["id"] = unique(self.slugify(innertext, self.sep), used_ids)  # noqa: E501
 
                 if int(el.tag[-1]) >= self.toc_top and int(el.tag[-1]) <= self.toc_bottom:  # noqa: E501
                     toc_tokens.append({
                         'level': int(el.tag[-1]),
                         'id': el.attrib["id"],
-                        'name': unescape(stashedHTML2text(
-                            code_escape(el.attrib.get('data-toc-label', text)),
-                            self.md, strip_entities=False
+                        'name': strip_tags(run_postprocessors(
+                            unescape(code_escape(
+                                el.attrib.get('data-toc-label', text))),
+                            self.md
                         ))
                     })
 

c2corg_api/models/association.py

@@ -321,7 +321,12 @@ def _get_load_associations_query(document, doc_types_to_load):
 
     return DBSession \
         .query(column('id'), column('t'), column('p')) \
-        .select_from(union(query_parents.select(), query_children.select()))
+        .select_from(
+            union(
+                query_parents.select(),
+                query_children.select()
+            ).subquery()
+        )
 
 
 def _diff_associations(new_associations, current_associations):

c2corg_api/models/utils.py

@@ -132,11 +132,12 @@ def int_for_range(start_id, end_id):
         else:
             return column >= start_id
 
-    q = session.query(
+    subq = session.query(
         column,
         func.row_number().over(order_by=column).label('rownum')
-    ). \
-        from_self(column)
+    ).subquery()
+
+    q = session.query(subq.c[column.key]).select_from(subq)
     if windowsize > 1:
         q = q.filter(sa.text("rownum %% %d=1" % windowsize))
 

c2corg_api/tests/__init__.py

@@ -282,7 +282,8 @@ def tearDown(self):  # noqa
         # (including calls to commit()) is rolled back.
         testing.tearDown()
         if not keep:
-            self.trans.rollback()
+            if self.trans.is_active:
+                self.trans.rollback()
         else:
             self.trans.commit()
         DBSession.remove()

c2corg_api/views/document_version.py

@@ -138,7 +138,8 @@ def get_neighbour_version_ids(version_id, document_id, lang):
     query = DBSession \
         .query(column('id'), column('t')) \
         .select_from(union(
-            next_version.select(), previous_version.select()))
+            next_version.select(), previous_version.select()
+        ).subquery())
 
     previous_version_id = None
     next_version_id = None

c2corg_api/views/route.py

@@ -432,9 +432,12 @@ def update_all_pt_rating(waypoint_extrapolation=True):
         .filter(Waypoint.waypoint_type == 'access') \
         .subquery()
     # Merge all routes
+    merged = union(
+        parent_routes.select(), children_routes.select()
+    ).subquery()
     routes = DBSession \
         .query(Route) \
-        .select_from(union(parent_routes.select(), children_routes.select())) \
+        .select_from(merged) \
         .join(Route, Route.document_id == column('route_id')) \
         .all()
 

c2corg_api/views/waypoint.py

@@ -535,9 +535,12 @@ def update_linked_routes_public_transportation_rating(waypoint, update_types):
         .filter(Association.parent_document_id == waypoint.document_id) \
         .subquery()
     # Merge all routes
+    merged = union(
+        parent_routes.select(), children_routes.select()
+    ).subquery()
     routes = DBSession \
         .query(Route) \
-        .select_from(union(parent_routes.select(), children_routes.select())) \
+        .select_from(merged) \
         .join(Route, Route.document_id == column('route_id')) \
         .all()
 

pytest.ini

@@ -1,4 +1,7 @@
 [pytest]
 addopts = --cov=c2corg_api
 filterwarnings =
-    ignore::DeprecationWarning
+    default
+    ignore:pkg_resources is deprecated:DeprecationWarning
+    ignore:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning
+    ignore:HTTPResponse.getheaders\(\) is deprecated:DeprecationWarning