girder 5.0.4.dev4__tar.gz → 5.0.5.dev4__tar.gz

{girder-5.0.4.dev4 → girder-5.0.5.dev4}/.circleci/config.yml

@@ -40,17 +40,17 @@ commands:
       - run:
           name: start mongo
           command: |
-            docker run --rm -d -p 127.0.0.1:27017:27017 mongo:latest bash -c "mongod --noauth --bind_ip_all"
+            docker run --rm -d -p 127.0.0.1:27017:27017 --name mongo mongo:latest bash -c "mongod --noauth --bind_ip_all"
           no_output_timeout: 1h
       - run:
           name: start rabbitmq
           command: |
-            docker run -d -p 5672:5672 rabbitmq
+            docker run -d -p 5672:5672 -v $(pwd)/girder/.circleci/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf --name rabbitmq rabbitmq
           no_output_timeout: 1h
       - run:
           name: start redis
           command: |
-            docker run -d -p 6379:6379 redis
+            docker run -d -p 6379:6379 --name redis redis
           no_output_timeout: 1h
   install-girder:
     description: "Install Girder in a virtualenv and configure CTest"
@@ -111,9 +111,10 @@ jobs:
     # with bind-mounted paths that don't work with docker-in-docker on CircleCI
     executor: machine
     steps:
-      - prerequisites
       - checkout:
           path: girder
+      # After checkout, since we need files in the .circleci folder
+      - prerequisites
       - install-girder
       - build-plugins
       - run:
@@ -246,11 +247,11 @@ jobs:
       - run:
           name: Start mongod
           command: |
-            docker run --rm -d -p 127.0.0.1:27017:27017 mongo:latest bash -c "mongod --noauth --bind_ip_all"
+            docker run --rm -d -p 127.0.0.1:27017:27017 --name mongo mongo:latest bash -c "mongod --noauth --bind_ip_all"
       - run:
           name: Start redis
           command: |
-            docker run -d -p 6379:6379 redis
+            docker run -d -p 6379:6379 --name redis redis
       - run:
           name: Install and build @girder/core
           command: |

girder-5.0.5.dev4/.circleci/rabbitmq.conf

@@ -0,0 +1 @@
+deprecated_features.permit.transient_nonexcl_queues = true

{girder-5.0.4.dev4/girder.egg-info → girder-5.0.5.dev4}/PKG-INFO

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

{girder-5.0.4.dev4 → girder-5.0.5.dev4}/girder/cli/mount.py

@@ -74,6 +74,7 @@ class ServerFuse(fuse.Operations):
         self.openFilesLock = threading.Lock()
         options = options or {}
         self.cache = cachetools.TTLCache(maxsize=10000, ttl=int(options.pop('stat_cache_ttl', 1)))
+        self.cacheLock = threading.Lock()
         self.diskcache = None
         self._mount_stats = {
             'open': 0,
@@ -160,7 +161,7 @@ class ServerFuse(fuse.Operations):
                 logger.debug('<- %s (length %d) %r', op, len(ret), ret[:16])
 
     @cachetools.cachedmethod(lambda self: self.cache, key=functools.partial(
-        _hashkey_first, '_get_path'))
+        _hashkey_first, '_get_path'), lock=lambda self: self.cacheLock)
     def _get_path(self, path):
         """
         Given a fuse path, return the associated resource.
@@ -336,7 +337,7 @@ class ServerFuse(fuse.Operations):
         return 0
 
     @cachetools.cachedmethod(lambda self: self.cache, key=functools.partial(
-        _hashkey_first, 'getattr'))
+        _hashkey_first, 'getattr'), lock=lambda self: self.cacheLock)
     def getattr(self, path, fh=None):
         """
         Get the attributes dictionary of a path.
@@ -465,7 +466,7 @@ class ServerFuse(fuse.Operations):
         return result
 
     @cachetools.cachedmethod(lambda self: self.cache, key=functools.partial(
-        _hashkey_first, '_get_direct_path'))
+        _hashkey_first, '_get_direct_path'), lock=lambda self: self.cacheLock)
     def _get_direct_path(self, path, doc):
         self._mount_stats['directpathchecks'] += 1
         try:

{girder-5.0.4.dev4 → girder-5.0.5.dev4/girder.egg-info}/PKG-INFO

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

{girder-5.0.4.dev4 → girder-5.0.5.dev4}/girder.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ tox.ini
 .circleci/generatePyEnvChecksum.sh
 .circleci/publish_npm.sh
 .circleci/publish_pypi.sh
+.circleci/rabbitmq.conf
 .github/workflows/codespell.yml
 clients/python/README.rst
 clients/python/pyproject.toml