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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-esi
-Version: 5.1.0
+Version: 5.3.0b1
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
 Author-email: Alliance Auth <adarnof@gmail.com>
 Requires-Python: >=3.8
@@ -11,6 +11,7 @@ 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: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
@@ -20,11 +21,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 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: celery>=4.0.2
-Requires-Dist: django>=2.2,<5
+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
@@ -64,6 +66,11 @@ Django-esi adds the following main functionalities to a Django site:
 - Support for adding EVE SSO to authenticate characters and retrieve tokens
 - Control over which ESI endpoint versions are used
 
+## Python Support
+
+Django-esi follows the Django Python support schedule, The supported version of Python will differ based on the version of Django used.
+<https://docs.djangoproject.com/en/5.0/faq/install/#what-python-version-can-i-use-with-django>
+
 ## History of this app
 
 This app is a fork from [adarnauth-esi](https://gitlab.com/Adarnof/adarnauth-esi). Since this app is an important component of the [Alliance Auth](https://gitlab.com/allianceauth/allianceauth) system and Adarnof - the original author - was no longer able to maintain it the AA dev team has decided in December 2019 to take over maintenance and further developing for this app within the Alliance Auth project.

{django_esi-5.1.0 → django_esi-5.3.0b1}/README.md

@@ -24,6 +24,11 @@ Django-esi adds the following main functionalities to a Django site:
 - Support for adding EVE SSO to authenticate characters and retrieve tokens
 - Control over which ESI endpoint versions are used
 
+## Python Support
+
+Django-esi follows the Django Python support schedule, The supported version of Python will differ based on the version of Django used.
+<https://docs.djangoproject.com/en/5.0/faq/install/#what-python-version-can-i-use-with-django>
+
 ## History of this app
 
 This app is a fork from [adarnauth-esi](https://gitlab.com/Adarnof/adarnauth-esi). Since this app is an important component of the [Alliance Auth](https://gitlab.com/allianceauth/allianceauth) system and Adarnof - the original author - was no longer able to maintain it the AA dev team has decided in December 2019 to take over maintenance and further developing for this app within the Alliance Auth project.

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

@@ -2,5 +2,5 @@
 
 default_app_config = 'esi.apps.EsiConfig'
 
-__version__ = '5.1.0'
+__version__ = '5.3.0b1'
 __title__ = 'django-esi'

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/app_settings.py

@@ -31,6 +31,8 @@ ESI_INFO_LOGGING_ENABLED = getattr(settings, 'ESI_INFO_LOGGING_ENABLED', False)
 ESI_LOG_LEVEL_LIBRARIES = str(getattr(settings, 'ESI_LOG_LEVEL_LIBRARIES', 'INFO'))
 """Set log level for libraries like bravado and urlib3."""
 
+ESI_DEBUG_RESPONSE_CONTENT_LOGGING = getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True)
+"""Enable/Disable logging of ESI response contents."""
 
 ESI_USER_CONTACT_EMAIL = getattr(settings, 'ESI_USER_CONTACT_EMAIL', None)
 """Contact email address of server owner.

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/clients.py

@@ -263,7 +263,8 @@ class CachingHttpFuture(HttpFuture):
                 result, response = super().result(**kwargs)
                 logger.debug('ESI response status code: %s', response.status_code)
                 logger.debug('ESI response headers: %s', response.headers)
-                logger.debug('ESI response content: %s', response.text)
+                if app_settings.ESI_DEBUG_RESPONSE_CONTENT_LOGGING:
+                    logger.debug('ESI response content: %s', response.text)
                 break
             except (HTTPBadGateway, HTTPGatewayTimeout, HTTPServiceUnavailable) as ex:
                 if retries < max_retries:

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/locale/de/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-08 23:42+1000\n"
-"PO-Revision-Date: 2023-10-08 09:37+0000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Peter Pfeufer, 2023\n"
 "Language-Team: German (https://app.transifex.com/alliance-auth/teams/107430/de/)\n"
 "MIME-Version: 1.0\n"

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/locale/es/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-08 23:42+1000\n"
-"PO-Revision-Date: 2023-10-08 09:37+0000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: trenus, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/alliance-auth/teams/107430/es/)\n"
 "MIME-Version: 1.0\n"

django_esi-5.3.0b1/esi/locale/it_IT/LC_MESSAGES/django.po

@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Thomas Turini, 2024
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-08 23:42+1000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
+"Last-Translator: Thomas Turini, 2024\n"
+"Language-Team: Italian (Italy) (https://app.transifex.com/alliance-auth/teams/107430/it_IT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it_IT\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+
+#: esi/models.py:72
+msgid "Character"
+msgstr "Personaggio"
+
+#: esi/models.py:73
+msgid "Corporation"
+msgstr "Corporazione"
+
+#: esi/templates/esi/select_token.html:13
+msgid "ESI Token Selection"
+msgstr "Selezione dei Token ESI"
+
+#: esi/templates/esi/select_token.html:44
+msgid "Select Character"
+msgstr "Selezione Personaggio"
+
+#: esi/templates/esi/select_token.html:48
+msgid "Scopes Requested"
+msgstr "Ambito Richiesto"
+
+#: esi/templates/esi/select_token.html:61
+#: esi/templates/esi/select_token.html:98
+msgid "New Character"
+msgstr "Nuovo Personaggio"
+
+#: esi/templates/esi/select_token.html:71
+#: esi/templates/esi/select_token.html:107
+msgid "Add Token"
+msgstr "Agg. Token"
+
+#: esi/templates/esi/select_token.html:88
+#: esi/templates/esi/select_token.html:89
+msgid "Select"
+msgstr "Seleziona"

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/locale/ja/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-08 23:42+1000\n"
-"PO-Revision-Date: 2023-10-08 09:37+0000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: kotaneko, 2023\n"
 "Language-Team: Japanese (https://app.transifex.com/alliance-auth/teams/107430/ja/)\n"
 "MIME-Version: 1.0\n"

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/locale/ko_KR/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-08 23:42+1000\n"
-"PO-Revision-Date: 2023-10-08 09:37+0000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Seowon Jung <seowon@hawaii.edu>, 2023\n"
 "Language-Team: Korean (Korea) (https://app.transifex.com/alliance-auth/teams/107430/ko_KR/)\n"
 "MIME-Version: 1.0\n"

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/locale/ru/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-08 23:42+1000\n"
-"PO-Revision-Date: 2023-10-08 09:37+0000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: Filipp Chertiev <f@fzfx.ru>, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/alliance-auth/teams/107430/ru/)\n"
 "MIME-Version: 1.0\n"

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/locale/zh_Hans/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-08 23:42+1000\n"
-"PO-Revision-Date: 2023-10-08 09:37+0000\n"
+"PO-Revision-Date: 2023-10-25 11:04+0000\n"
 "Last-Translator: heguyChen, 2023\n"
 "Language-Team: Chinese Simplified (https://app.transifex.com/alliance-auth/teams/107430/zh-Hans/)\n"
 "MIME-Version: 1.0\n"

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

@@ -76,9 +76,25 @@ class TokenQueryset(models.QuerySet):
             All tokens which are still valid.
         """
         expired = self.get_expired()
-        valid = self.exclude(pk__in=expired)
-        valid_expired = expired.bulk_refresh()
-        return valid_expired | valid
+        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
 
     def require_scopes(self, scope_string: Union[str, list]) -> models.QuerySet:
         """Filter tokens which have at least a subset of given scopes.

{django_esi-5.1.0 → django_esi-5.3.0b1}/esi/tests/test_clients.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import os
 from unittest.mock import patch, Mock
 import json
@@ -12,7 +12,6 @@ import requests_mock
 import django
 from django.contrib.auth.models import User
 from django.core.cache import cache
-from django.utils import timezone
 
 from . import _generate_token, _store_as_Token, NoSocketsTestCase
 from .factories import create_http_error

{django_esi-5.1.0 → django_esi-5.3.0b1}/pyproject.toml

@@ -18,6 +18,7 @@ classifiers = [
     "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.1",
     "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Operating System :: OS Independent",
@@ -27,13 +28,14 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 ]
 dependencies = [
     "bravado>=10.6.0,<11.0",
     "celery>=4.0.2",
-    "django>=2.2,<5",
+    "django>=2.2,<5.1",
     "jsonschema<4.0.0",
     "python-jose>=3.3.0",
     "requests>=2.26.0",