girder 5.0.19.dev26__tar.gz → 5.0.19.dev55__tar.gz

{girder-5.0.19.dev26 → girder-5.0.19.dev55}/.circleci/config.yml

@@ -174,6 +174,7 @@ jobs:
 
   web-test:
     executor: py3-mongo
+    resource_class: large
     steps:
       - checkout:
           path: girder
@@ -193,6 +194,8 @@ jobs:
           name: Test @girder/core
           command: npm run test
           working_directory: girder/girder/web
+          environment:
+            PLAYWRIGHT_WORKERS: 3
       - store_artifacts:
           path: girder/girder/web/coverage/report
           destination: coverage

{girder-5.0.19.dev26 → girder-5.0.19.dev55}/.pre-commit-config.yaml

@@ -69,8 +69,8 @@ repos:
         args:
           - --py310-plus
           - --keep-percent-format
-  - repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v2.0.4
+  - repo: https://github.com/hhatto/autopep8
+    rev: v2.3.2
     hooks:
       - id: autopep8
   - repo: https://github.com/PyCQA/flake8

{girder-5.0.19.dev26/girder.egg-info → girder-5.0.19.dev55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.19.dev26
+Version: 5.0.19.dev55
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.19.dev26 → girder-5.0.19.dev55}/girder/api/api_docs.mako

@@ -3,9 +3,9 @@
   <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>${brandName | h} - REST API Documentation</title>
-    <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist@5.20.1/swagger-ui.css">
+    <link rel="stylesheet" href="${urlRoot}/swagger-ui/swagger-ui.css">
     <link rel="icon" type="image/png" href="/Girder_Favicon.png">
-    <script src="https://unpkg.com/swagger-ui-dist@5.20.1/swagger-ui-bundle.js"></script>
+    <script src="${urlRoot}/swagger-ui/swagger-ui-bundle.js"></script>
   </head>
   <body>
     <div id="swagger-ui-container"></div>

{girder-5.0.19.dev26 → girder-5.0.19.dev55}/girder/models/__init__.py

@@ -10,15 +10,14 @@ _dbClients = {}
 logger = logging.getLogger(__name__)
 
 
+# pymongo 4 removed ``Cursor.count``.  Girder intentionally keeps a ``count`` method on
+# cursors, because endpoints return cursors and report a total count (for example via the
+# ``Girder-Total-Count`` header) alongside the requested records.  Rather than thread an
+# out-of-band count through every such call site, the shim reimplements the pymongo 3
+# behavior using ``count_documents``, which is the non-deprecated API.  Because this is the
+# sanctioned way to count a cursor here, it must not emit a deprecation warning.
 if not hasattr(pymongo.cursor.Cursor, 'count'):
-    import warnings
-
     def _cursorCount(self, with_limit_and_skip=False):
-        warnings.warn(
-            'count is deprecated. Use Collection.count_documents instead.',
-            DeprecationWarning,
-            stacklevel=2,
-        )
         params = {}
         if with_limit_and_skip and getattr(self, '_limit', getattr(self, '_Cursor__limit', None)):
             params['limit'] = getattr(self, '_limit', getattr(self, '_Cursor__limit', None))

{girder-5.0.19.dev26 → girder-5.0.19.dev55}/girder/notification.py

@@ -81,7 +81,7 @@ class UserNotificationsSocket(WebSocketEndpoint):
             pass
         finally:
             await self.pubsub.unsubscribe()
-            await self.pubsub.close()
+            await self.pubsub.aclose()
 
     async def on_disconnect(self, websocket, close_code):
         if hasattr(self, 'listen_task'):