girder 3.2.13.dev11__tar.gz → 3.2.15.dev2__tar.gz

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/.circleci/config.yml

@@ -344,7 +344,7 @@ jobs:
       - run:
           name: Build the Girder docker
           command: |
-            docker build --force-rm -t girder/girder .
+            docker build --force-rm -t girder/girder:3-latest .
       - run:
           name: Build the Girder test docker
           command: |
@@ -354,9 +354,9 @@ jobs:
           name: Publish the images to Docker Hub
           command: |
               echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
-              docker push girder/girder:latest
-              docker tag girder/girder:latest girder/girder:latest-py3
-              docker push girder/girder:latest-py3
+              docker push girder/girder:3-latest
+              docker tag girder/girder:3-latest girder/girder:3-latest-py3
+              docker push girder/girder:3-latest-py3
               if [[ $CIRCLE_TAG =~ ^v.*$ ]]; then
               docker tag girder/girder:latest "girder/girder:$CIRCLE_TAG"
               docker push "girder/girder:$CIRCLE_TAG"
@@ -449,7 +449,7 @@ workflows:
             tags:
               only: /^v[0-9]+.*/
             branches:
-              only: master
+              only: 3.x-maintenance
       - publish-release:
           requires:
             - server-lint-test
@@ -469,5 +469,4 @@ workflows:
             tags:
               only: /^v.*/
             branches:
-              only:
-                - master
+              only: 3.x-maintenance

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

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

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/clients/python/setup.py

@@ -1,4 +1,5 @@
 import os
+import re
 
 from setuptools import setup, find_packages
 
@@ -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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/girder/cli/mount.py

@@ -72,6 +72,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,
@@ -158,7 +159,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.
@@ -334,7 +335,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.
@@ -463,7 +464,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-3.2.13.dev11 → girder-3.2.15.dev2}/girder/web_client/src/package.json

@@ -17,7 +17,7 @@
         "bootstrap": "^3.4.1",
         "bootstrap-switch": "~3.3.4",
         "eonasdan-bootstrap-datetimepicker": "^4.17",
-        "@girder/fontello": "*",
+        "@girder/fontello": "^3.0.0",
         "jquery": "^3.7.0",
         "jsoneditor": "~5.9.3",
         "moment": "^2.24.0",

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

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

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/audit_logs/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/authorized_upload/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/autojoin/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/dicom_viewer/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/download_statistics/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/google_analytics/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/gravatar/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/hashsum_download/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/homepage/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/item_licenses/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/jobs/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/ldap/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/oauth/girder_oauth/providers/base.py

@@ -139,8 +139,10 @@ class ProviderBase:
         setId = not user
 
         # Existing users using OAuth2 for the first time will not have an ID
+        # We check the lower-case email, as Girder users cast emails to
+        # lower-case
         if not user:
-            user = User().findOne({'email': email})
+            user = User().findOne({'email': email.lower()})
 
         dirty = False
         # Create the user if it's still not found
@@ -162,8 +164,8 @@ class ProviderBase:
                 user['oauth'] = [user['oauth']]
                 dirty = True
             # Update user data from provider
-            if email != user['email']:
-                user['email'] = email
+            if email.lower() != user['email']:
+                user['email'] = email.lower()
                 dirty = True
             # Don't set names to empty string
             if firstName != user['firstName'] and firstName:

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/oauth/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/readme/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/sentry/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/terms/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/thumbnails/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/user_quota/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/plugins/virtual_folders/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/pytest_girder/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)

{girder-3.2.13.dev11 → girder-3.2.15.dev2}/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)