pytest-girder 3.2.13.dev11__tar.gz → 3.2.15__tar.gz

{pytest_girder-3.2.13.dev11/pytest_girder.egg-info → pytest_girder-3.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-girder
-Version: 3.2.13.dev11
+Version: 3.2.15
 Summary: A set of pytest fixtures for testing Girder applications.
 Author: Kitware, Inc.
 Author-email: kitware@kitware.com

{pytest_girder-3.2.13.dev11 → pytest_girder-3.2.15}/pytest_girder/fixtures.py

@@ -3,6 +3,7 @@ import mongomock
 import os
 import pytest
 import shutil
+import time
 import unittest.mock
 
 from .plugin_registry import PluginRegistry
@@ -60,7 +61,11 @@ def db(request):
     # Since models store a local reference to the current database, we need to force them all to
     # reconnect
     for model in model_base._modelSingletons:
-        model.reconnect()
+        try:
+            model.reconnect()
+        except OSError:
+            # Ignore lazy index creation errors
+            pass
 
     # Use faster password hashing to avoid unnecessary testing bottlenecks. Any test case
     # that creates a user goes through the password hashing process, so we avoid actual bcrypt.
@@ -197,12 +202,22 @@ def fsAssetstore(db, request):
     path = os.path.join(ROOT_DIR, 'tests', 'assetstore', name)
 
     if os.path.isdir(path):
-        shutil.rmtree(path)
+        for _ in range(5):
+            try:
+                shutil.rmtree(path)
+                break
+            except Exception:
+                time.sleep(1)
 
     yield Assetstore().createFilesystemAssetstore(name=name, root=path)
 
     if os.path.isdir(path):
-        shutil.rmtree(path)
+        for _ in range(5):
+            try:
+                shutil.rmtree(path)
+                break
+            except Exception:
+                time.sleep(1)
 
 
 __all__ = ('admin', 'db', 'fsAssetstore', 'server', 'boundServer', 'user', 'smtp')

{pytest_girder-3.2.13.dev11 → pytest_girder-3.2.15/pytest_girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-girder
-Version: 3.2.13.dev11
+Version: 3.2.15
 Summary: A set of pytest fixtures for testing Girder applications.
 Author: Kitware, Inc.
 Author-email: kitware@kitware.com

{pytest_girder-3.2.13.dev11 → pytest_girder-3.2.15}/setup.py

@@ -1,4 +1,5 @@
 import os
+import re
 
 from setuptools import find_packages, setup
 
@@ -12,7 +13,11 @@ def prerelease_local_scheme(version):
     """
     from setuptools_scm.version import get_local_node_and_date
 
-    if os.getenv('CIRCLE_BRANCH') == 'master':
+    # this regex allows us to publish pypi packages from master, our LTS maintenance branches, and
+    # our next major version integration branches
+    pattern = r'master|[0-9]+\.x-maintenance|v[0-9]+-integration'
+
+    if re.match(pattern, os.getenv('CIRCLE_BRANCH', '')):
         return ''
     else:
         return get_local_node_and_date(version)