django-esi 5.3.0b1__tar.gz → 6.0.0__tar.gz

{django_esi-5.3.0b1 → django_esi-6.0.0}/PKG-INFO

@@ -1,22 +1,20 @@
 Metadata-Version: 2.1
 Name: django-esi
-Version: 5.3.0b1
+Version: 6.0.0
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
 Author-email: Alliance Auth <adarnof@gmail.com>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 3.2
-Classifier: Framework :: Django :: 4.0
-Classifier: Framework :: Django :: 4.1
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -24,21 +22,30 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Dist: bravado>=10.6.0,<11.0
+Requires-Dist: bravado>=10.6,<11
+Requires-Dist: brotli
 Requires-Dist: celery>=4.0.2
-Requires-Dist: django>=2.2,<5.1
-Requires-Dist: jsonschema<4.0.0
-Requires-Dist: python-jose>=3.3.0
-Requires-Dist: requests>=2.26.0
-Requires-Dist: requests_oauthlib>=0.8.0
+Requires-Dist: django>=4.2,<5.2
+Requires-Dist: jsonschema<4
+Requires-Dist: python-jose>=3.3
+Requires-Dist: requests>=2.26
+Requires-Dist: requests-oauthlib>=0.8
 Requires-Dist: tqdm>=4.62.3
-Requires-Dist: brotli
-Requires-Dist: sphinx ; extra == "docs"
 Requires-Dist: myst-parser ; extra == "docs"
-Requires-Dist: sphinx_rtd_theme ; extra == "docs"
-Requires-Dist: sphinxcontrib-django2 ; extra == "docs"
+Requires-Dist: sphinx ; extra == "docs"
+Requires-Dist: sphinx-copybutton ; extra == "docs"
+Requires-Dist: sphinx-rtd-theme<3,>=2 ; extra == "docs"
+Requires-Dist: sphinx-tabs ; extra == "docs"
+Requires-Dist: sphinxcontrib-django ; extra == "docs"
+Requires-Dist: coverage ; extra == "test"
+Requires-Dist: factory-boy ; extra == "test"
+Requires-Dist: requests-mock ; extra == "test"
+Project-URL: Documentation, https://django-esi.readthedocs.io/en/latest/
 Project-URL: Homepage, https://gitlab.com/allianceauth/django-esi
+Project-URL: Source, https://gitlab.com/allianceauth/django-esi
+Project-URL: Tracker, https://gitlab.com/allianceauth/django-esi/-/issues
 Provides-Extra: docs
+Provides-Extra: test
 
 # django-esi
 

{django_esi-5.3.0b1 → django_esi-6.0.0}/esi/__init__.py

@@ -1,6 +1,5 @@
 """Django app for accessing the EVE Swagger Interface (ESI)."""
 
-default_app_config = 'esi.apps.EsiConfig'
 
-__version__ = '5.3.0b1'
+__version__ = '6.0.0'
 __title__ = 'django-esi'

{django_esi-5.3.0b1 → django_esi-6.0.0}/esi/admin.py

@@ -17,10 +17,12 @@ class TokenAdmin(admin.ModelAdmin):
         qs = super().get_queryset(request)
         return qs.select_related('user').prefetch_related('scopes')
 
+    @admin.display(
+        description='Scopes'
+    )
     def get_scopes(self, obj):
         return ", ".join([x.name for x in obj.scopes.all()])
 
-    get_scopes.short_description = 'Scopes'
 
     User = get_user_model()
     list_display = ('user', 'character_name', 'get_scopes')

{django_esi-5.3.0b1 → django_esi-6.0.0}/esi/managers.py

@@ -1,18 +1,16 @@
-from datetime import timedelta
 import logging
-from typing import Union, Any
+from datetime import timedelta
+from typing import Any, Union
 
 import requests
-from requests_oauthlib import OAuth2Session
-
 from django.db import models
 from django.utils import timezone
-
-from .errors import TokenError, IncompleteResponseError
-from . import app_settings
-
 from jose import jwt
 from jose.exceptions import ExpiredSignatureError, JWTError
+from requests_oauthlib import OAuth2Session
+
+from . import app_settings
+from .errors import IncompleteResponseError, TokenError
 
 logger = logging.getLogger(__name__)
 
@@ -75,26 +73,12 @@ class TokenQueryset(models.QuerySet):
         Returns:
             All tokens which are still valid.
         """
-        expired = self.get_expired()
-        valid = list(
-            self.exclude(
-                pk__in=expired
-            ).values_list(
-                "pk",
-                flat=True
-            )
-        )
-        valid_expired = list(
-            expired.bulk_refresh(
-            ).values_list(
-                "pk",
-                flat=True
-            )
-        )
-        _qs = self.filter(
-            pk__in=(valid + valid_expired)
-        )
-        return _qs
+        expired_pks = set(self.get_expired().values_list("pk", flat=True))
+        fresh_pks = set(self.exclude(pk__in=expired_pks).values_list("pk", flat=True))
+        refreshed = self.filter(pk__in=expired_pks).bulk_refresh()
+        refreshed_pks = set(refreshed.values_list("pk", flat=True))
+        qs = self.filter(pk__in=fresh_pks | refreshed_pks)
+        return qs
 
     def require_scopes(self, scope_string: Union[str, list]) -> models.QuerySet:
         """Filter tokens which have at least a subset of given scopes.