girder 3.2.9.dev12__tar.gz → 3.2.9.dev16__tar.gz

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/.circleci/Dockerfile

@@ -1,4 +1,4 @@
-FROM cimg/python:3.8
+FROM cimg/python:3.9
 LABEL maintainer="Kitware, Inc. <kitware@kitware.com>"
 
 # Don't use "sudo"

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/.circleci/config.yml

@@ -5,15 +5,15 @@ executors:
   py3:
     docker:
       # This image uses the newest version of many dependencies
-      - image: girder/girder_test:py38-node14
+      - image: girder/girder_test:py39-node14
     working_directory: /home/circleci/project
   py3-mongo:
     docker:
-      - image: girder/girder_test:py38-node14
+      - image: girder/girder_test:py39-node14
       # Use the oldest supported MongoDB
       # This is equivalent to the deprecated circleci/mongo:<version>-ram image
-      - image: mongo:3.6
-        command: bash -c "mkdir /dev/shm/mongo && mongod --storageEngine ephemeralForTest --nojournal --dbpath=/dev/shm/mongo --noauth --bind_ip_all"
+      - image: mongo:5.0
+        command: bash -c "mongod --noauth --bind_ip_all"
     working_directory: /home/circleci/project
   machine:
     machine:
@@ -28,7 +28,7 @@ commands:
           name: Generate python environment checksum file
           command: ./girder/.circleci/generatePyEnvChecksum.sh > girder/py-env-checksum
       - restore_cache:
-          key: venv-py3.8-{{ arch }}-{{ checksum "girder/py-env-checksum" }}-5
+          key: venv-py3.9-{{ arch }}-{{ checksum "girder/py-env-checksum" }}-5
       - run:
           name: Create virtual environment (if necessary)
           command: if [ ! -d girder_env ]; then python3 -m venv girder_env; fi
@@ -52,7 +52,7 @@ commands:
       - save_cache:
           paths:
             - girder_env
-          key: venv-py3.8-{{ arch }}-{{ checksum "girder/py-env-checksum" }}-5
+          key: venv-py3.9-{{ arch }}-{{ checksum "girder/py-env-checksum" }}-5
 
 jobs:
   server-lint-test:
@@ -107,7 +107,7 @@ jobs:
             --exclude-regex '^server_pytest_core$'
           environment:
             TEST_GROUP: python
-            PYTHON_VERSION: 3.8
+            PYTHON_VERSION: 3.9
             PYTHON_EXECUTABLE: /home/circleci/project/girder_env/bin/python
           working_directory: girder_build
       - persist_to_workspace:
@@ -149,7 +149,7 @@ jobs:
             --script "$CIRCLE_WORKING_DIRECTORY/girder/.circleci/ci_test.cmake"
           environment:
             TEST_GROUP: browser
-            PYTHON_VERSION: 3.8
+            PYTHON_VERSION: 3.9
             PYTHON_EXECUTABLE: /home/circleci/project/girder_env/bin/python
             JASMINE_TIMEOUT: 15000
           working_directory: girder_build
@@ -211,10 +211,11 @@ jobs:
           name: Allow Boto to work with Python 3
           command: sudo rm --force /etc/boto.cfg
       - run:
-          name: Set up Python 3.8
+          name: Set up Python 3.9
           command: |
-             pyenv install 3.8.12 || true
-             pyenv global 3.8.12
+             pyenv install --list
+             pyenv install 3.9.7 || true
+             pyenv global 3.9.7
       - run:
           name: Install system dependencies for Girder plugins
           command: sudo apt-get install -y libldap2-dev libsasl2-dev
@@ -233,7 +234,7 @@ jobs:
           command: >-
             cmake
             ../girder
-            -DPYTHON_VERSION=3.8
+            -DPYTHON_VERSION=3.9
             -DPYTHON_EXECUTABLE=$CIRCLE_WORKING_DIRECTORY/girder_env/bin/python
           working_directory: girder_build
       - run:
@@ -293,7 +294,7 @@ jobs:
 
   ansible-test:
     docker:
-      - image: cimg/python:3.8
+      - image: cimg/python:3.9
     working_directory: ~/project
     steps:
       - run:
@@ -327,7 +328,7 @@ jobs:
           name: Build the Girder test docker
           command: |
             cd .circleci
-            docker build --force-rm -t girder/girder_test:py38-node14 .
+            docker build --force-rm -t girder/girder_test:py39-node14 .
 
   publish-dockers:
     machine:
@@ -342,7 +343,7 @@ jobs:
           name: Build the Girder test docker
           command: |
             cd .circleci
-            docker build --force-rm -t girder/girder_test:py38-node14 .
+            docker build --force-rm -t girder/girder_test:py39-node14 .
       - run:
           name: Publish the images to Docker Hub
           command: |
@@ -356,11 +357,11 @@ jobs:
               docker tag girder/girder:latest "girder/girder:${CIRCLE_TAG}-py3"
               docker push "girder/girder:${CIRCLE_TAG}-py3"
               fi
-              docker push girder/girder_test:py38-node14
+              docker push girder/girder_test:py39-node14
 
   publish:
     docker:
-      - image: cimg/python:3.8
+      - image: cimg/python:3.9
     working_directory: ~/project
     steps:
       - checkout:

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: girder
-Version: 3.2.9.dev12
+Version: 3.2.9.dev16
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 License-File: LICENSE
 Requires-Dist: boto3
 Requires-Dist: botocore
@@ -24,6 +24,7 @@ Requires-Dist: filelock
 Requires-Dist: jsonschema
 Requires-Dist: Mako
 Requires-Dist: passlib[bcrypt,totp]
+Requires-Dist: packaging
 Requires-Dist: pymongo>=4
 Requires-Dist: PyYAML
 Requires-Dist: psutil
@@ -37,6 +38,17 @@ Provides-Extra: mount
 Requires-Dist: cachetools; extra == "mount"
 Requires-Dist: diskcache; extra == "mount"
 Requires-Dist: fusepy>=3.0; extra == "mount"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 |logo| Girder |build-status| |docs-status| |license-badge| |codecov-badge|
 ==========================================================================

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/clients/python/girder_client/__init__.py

@@ -1,8 +1,8 @@
-from pkg_resources import DistributionNotFound, get_distribution
+import importlib.metadata
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
     # package is not installed
     __version__ = None
 

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/docs/conf.py

@@ -1,20 +1,21 @@
-import pkg_resources
+import importlib.metadata
+import importlib.resources
 
+import packaging.requirements
 from sphinx.domains.python import PythonDomain
 
 # needs_sphinx = '1.6'
 
+
 # Get package imports and version
-# The 'girder' and "girder_client" packages must be installed at this point
-_girder_package = pkg_resources.get_distribution('girder')
-_girder_client_package = pkg_resources.get_distribution('girder_client')
+_girder_package = importlib.metadata.distribution('girder')
+_girder_client_package = importlib.metadata.distribution('girder_client')
 _girder_version = _girder_package.version
 _girder_imports = {
-    _requirement.project_name.lower()
+    packaging.requirements.Requirement(_requirement).name.lower()
     for _package in [_girder_package, _girder_client_package]
-    for _requirement in _package.requires(_package.extras)
+    for _requirement in _package.requires
 }
-# Add importable module names that are different from package names
 _girder_imports |= {
     'botocore',
     'bson',

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/docs/requirements-docs.txt

@@ -1,3 +1,4 @@
 # See tox.ini for documentation on this file.
 Sphinx
 sphinx_rtd_theme
+packaging

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/girder/__init__.py

@@ -1,8 +1,8 @@
-from pkg_resources import DistributionNotFound, get_distribution
+import importlib.metadata
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
     # package is not installed
     __version__ = None
 

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/girder/cli/__init__.py

@@ -1,9 +1,13 @@
 from click_plugins import with_plugins
-from pkg_resources import iter_entry_points
 import click
+import importlib.metadata
 
 
-@with_plugins(iter_entry_points('girder.cli_plugins'))
+@with_plugins(
+    importlib.metadata.entry_points().select(group='girder.cli_plugins')
+    if hasattr(importlib.metadata.entry_points(), 'select') else
+    importlib.metadata.entry_points().get('girder.cli_plugins', [])
+)
 @click.group(help='Girder: data management platform for the web.',
              context_settings=dict(help_option_names=['-h', '--help']))
 @click.version_option(message='%(version)s')

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/girder/cli/build.py

@@ -1,9 +1,9 @@
+import importlib.resources
 import json
 import os
-from pkg_resources import resource_filename
-from subprocess import check_call
 import shutil
 import sys
+from subprocess import check_call
 
 import click
 
@@ -12,8 +12,7 @@ from girder.constants import STATIC_ROOT_DIR, ServerMode
 from girder.plugin import allPlugins, getPlugin
 from girder.utility import server
 
-
-_GIRDER_BUILD_ASSETS_PATH = os.path.realpath(resource_filename('girder', 'web_client'))
+_GIRDER_BUILD_ASSETS_PATH = str(importlib.resources.files('girder') / 'web_client')
 
 
 @click.command(name='build', help='Build web client static assets.')

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/girder/plugin.py

@@ -2,17 +2,15 @@
 This module defines functions for registering, loading, and querying girder plugins.
 """
 
-import distutils.dist
-from functools import wraps
-import io
+import importlib.metadata
+import importlib.resources
 import json
 import os
-from pkg_resources import iter_entry_points, resource_filename
+from functools import wraps
 
 from girder import logprint
 from girder.exceptions import GirderException
 
-
 _NAMESPACE = 'girder.plugin'
 _pluginRegistry = None
 _pluginLoadOrder = []
@@ -95,7 +93,9 @@ class GirderPlugin(metaclass=_PluginMeta):
     def __init__(self, entrypoint):
         self._name = entrypoint.name
         self._loaded = False
-        self._dist = entrypoint.dist
+        self._dist = (
+            entrypoint.dist if hasattr(entrypoint, 'dist') else
+            importlib.metadata.distribution(entrypoint.value.split(':')[0].split('.')[0]))
         self._metadata = _readPackageMetadata(self._dist)
 
     def npmPackages(self):
@@ -108,10 +108,18 @@ class GirderPlugin(metaclass=_PluginMeta):
         if self.CLIENT_SOURCE_PATH is None:
             return {}
 
-        packageJsonFile = resource_filename(
-            self.__module__,
-            os.path.join(self.CLIENT_SOURCE_PATH, 'package.json')
-        )
+        module = self.__module__
+        while True:
+            try:
+                packageJsonFile = (
+                    importlib.resources.files(module)
+                    / self.CLIENT_SOURCE_PATH / 'package.json')
+                break
+            except Exception:
+                if '.' in module:
+                    module = module.rsplit('.', 1)[0]
+                else:
+                    raise
         if not os.path.isfile(packageJsonFile):
             raise Exception('Invalid web client path provided: %s' % packageJsonFile)
 
@@ -134,17 +142,17 @@ class GirderPlugin(metaclass=_PluginMeta):
     @property
     def description(self):
         """Return the plugin description defaulting to the classes docstring."""
-        return self._metadata.description
+        return self._metadata.get('description', self._metadata.get('Summary', ''))
 
     @property
     def url(self):
         """Return a url reference to the plugin (usually a readthedocs page)."""
-        return self._metadata.url
+        return self._metadata.get('url', self._metadata.get('Home-page', ''))
 
     @property
     def version(self):
         """Return the version of the plugin automatically determined from setup.py."""
-        return self._metadata.version
+        return self._dist.version
 
     @property
     def loaded(self):
@@ -157,10 +165,13 @@ class GirderPlugin(metaclass=_PluginMeta):
 
 def _readPackageMetadata(distribution):
     """Get a metadata object associated with a python package."""
-    metadata_string = distribution.get_metadata(distribution.PKG_INFO)
-    metadata = distutils.dist.DistributionMetadata()
-    metadata.read_pkg_file(io.StringIO(metadata_string))
-    return metadata
+    return distribution.metadata
+
+
+def _listPluginEntryPoints():
+    if hasattr(importlib.metadata.entry_points(), 'select'):
+        return importlib.metadata.entry_points().select(group=_NAMESPACE)
+    return importlib.metadata.entry_points().get(_NAMESPACE, [])
 
 
 def _getPluginRegistry():
@@ -175,7 +186,7 @@ def _getPluginRegistry():
         return _pluginRegistry
 
     _pluginRegistry = {}
-    for entryPoint in iter_entry_points(_NAMESPACE):
+    for entryPoint in _listPluginEntryPoints():
         pluginClass = entryPoint.load()
         plugin = pluginClass(entryPoint)
         _pluginRegistry[plugin.name] = plugin

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/girder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: girder
-Version: 3.2.9.dev12
+Version: 3.2.9.dev16
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.
@@ -12,7 +12,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 License-File: LICENSE
 Requires-Dist: boto3
 Requires-Dist: botocore
@@ -24,6 +24,7 @@ Requires-Dist: filelock
 Requires-Dist: jsonschema
 Requires-Dist: Mako
 Requires-Dist: passlib[bcrypt,totp]
+Requires-Dist: packaging
 Requires-Dist: pymongo>=4
 Requires-Dist: PyYAML
 Requires-Dist: psutil
@@ -37,6 +38,17 @@ Provides-Extra: mount
 Requires-Dist: cachetools; extra == "mount"
 Requires-Dist: diskcache; extra == "mount"
 Requires-Dist: fusepy>=3.0; extra == "mount"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 |logo| Girder |build-status| |docs-status| |license-badge| |codecov-badge|
 ==========================================================================

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/girder.egg-info/requires.txt

@@ -8,6 +8,7 @@ filelock
 jsonschema
 Mako
 passlib[bcrypt,totp]
+packaging
 pymongo>=4
 PyYAML
 psutil

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/pytest_girder/pytest_girder/plugin_registry.py

@@ -1,7 +1,8 @@
 import distutils
 from contextlib import contextmanager
+import email.parser
 import io
-from pkg_resources import iter_entry_points
+import importlib.metadata
 from tempfile import gettempdir
 import unittest.mock
 
@@ -13,6 +14,10 @@ class _MockDistribution:
         self.location = location or gettempdir()
         self._metadata = self._generateMetadata(name, version, description, url)
 
+    @property
+    def metadata(self):
+        return self._meta.__dict__
+
     def get_metadata(self, *args, **kwargs):
         return self._metadata
 
@@ -27,11 +32,14 @@ class _MockDistribution:
         meta.provides_extras = ()
         meta.license_file = None
         meta.license_files = None
+        meta.license_expression = None
         meta.install_requires = []
         meta.extras_require = {}
         pkgInfo = io.StringIO()
         meta.write_pkg_file(pkgInfo)
-        return pkgInfo.getvalue()
+        self._meta = meta
+        pkgInfo.seek(0)
+        return {k: v for k, v in email.parser.Parser().parse(pkgInfo).items()}
 
 
 class _MockEntryPoint:
@@ -65,9 +73,22 @@ class PluginRegistry:
     def registerEntrypoint(self, entryPoint):
         self._plugins.append(entryPoint)
 
-    def _iter_entry_points(self, *args, **kwargs):
+    def _listPluginEntryPoints(self, *args, **kwargs):
         if self._include_installed_plugins:
-            yield from iter_entry_points(*args, **kwargs)
+            kwargs = kwargs.copy()
+            kwargs['group'] = 'girder.plugin'
+            if len(args):
+                kwargs['group'] = args[0]
+                if len(args) > 1:
+                    kwargs['name'] = args[1]
+            if hasattr(importlib.metadata.entry_points(), 'select'):
+                yield from importlib.metadata.entry_points().select(**kwargs)
+            else:
+                for epk in importlib.metadata.entry_points():
+                    for ep in importlib.metadata.entry_points()[epk]:
+                        if (ep.group == kwargs['group']
+                                and ep.name == kwargs.get('name', ep.name)):
+                            yield ep
         yield from self._plugins
 
     @contextmanager
@@ -76,7 +97,8 @@ class PluginRegistry:
 
         try:
             with unittest.mock.patch.object(
-                    plugin, 'iter_entry_points', side_effect=self._iter_entry_points) as mock_:
+                    plugin, '_listPluginEntryPoints',
+                    side_effect=self._listPluginEntryPoints) as mock_:
                 yield mock_
         finally:
             plugin._pluginRegistry = None

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/setup.py

@@ -31,7 +31,8 @@ installReqs = [
     'filelock',
     'jsonschema',
     'Mako',
-    'passlib [bcrypt,totp]',
+    'passlib[bcrypt,totp]',
+    'packaging',
     'pymongo>=4',
     'PyYAML',
     'psutil',
@@ -72,7 +73,7 @@ setup(
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
     ],
-    python_requires='>=3.8',
+    python_requires='>=3.9',
     packages=find_packages(
         exclude=('girder.test', 'tests.*', 'tests', '*.plugin_tests.*', '*.plugin_tests')
     ),

{girder-3.2.9.dev12 → girder-3.2.9.dev16}/tox.ini

@@ -153,6 +153,8 @@ ignore =
     D401,
     # E123 - Closing bracket does not match indentation of opening bracket's line
     E123,
+    # F824 - Name is never used in scope
+    F824,
     # N802 - Function name should be lowercase.
     N802,
     # N803 - Argument name should be lowercase.