aa-fleetfinder 2.4.0__py3-none-any.whl → 2.5.0__py3-none-any.whl

{aa_fleetfinder-2.4.0.dist-info → aa_fleetfinder-2.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-fleetfinder
-Version: 2.4.0
+Version: 2.5.0
 Summary: Fleet finder plugin for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-fleetfinder/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-fleetfinder/blob/master/README.md
@@ -702,6 +702,7 @@ Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.10
 Requires-Dist: allianceauth-app-utils>=1.14.2
 Requires-Dist: allianceauth<5,>=4.6
+Requires-Dist: django-esi>=7.0.1
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
 Requires-Dist: django-webtest; extra == 'tests-allianceauth-latest'

{aa_fleetfinder-2.4.0.dist-info → aa_fleetfinder-2.5.0.dist-info}/RECORD

@@ -1,10 +1,9 @@
-fleetfinder/__init__.py,sha256=OQvE5artc_nBFw4SUqE4xrjhS3q700-mFsTPrVjU6Bg,197
+fleetfinder/__init__.py,sha256=l-QO_UtEsVDQ2c0k6Tq3LXApixl1aVNv0lqXYMMYkI8,415
 fleetfinder/app_settings.py,sha256=XE5oZFg2Vhn5OYQFehoOwjgVgKAvXcyj5NGmrbr3bk8,261
 fleetfinder/apps.py,sha256=5t6R6HS_2cK3oCtTomvOM0dagt4sQkbnIWBhxT8dHrw,448
 fleetfinder/auth_hooks.py,sha256=_oHqIEfTFDB1lsVAOrEGCc6aLiLpRtjcPw7CdLNSdKw,1234
-fleetfinder/constants.py,sha256=apKYhl8Wu9pvifDXr4fU9wAb-1SpB7NhpBc_DJNPe5U,601
 fleetfinder/models.py,sha256=MEqsa-gRzFlCoU5awPwlLUzJ_2A2sNo9cPtfT-hVCNU,2805
-fleetfinder/providers.py,sha256=R6cy9MAxPw8AcZuIQwpQ1Knv13ItWCBCAspnJ_G30_U,205
+fleetfinder/providers.py,sha256=Je9FZvALV1ARn_34yllhztl5nG3tT7y1ri7utFHwO_o,298
 fleetfinder/tasks.py,sha256=pqDMPHFMXej4dPrf8fxucuYKtj9JPlActiNPIc4eAAQ,10969
 fleetfinder/urls.py,sha256=oL6zOnvQaGXFp-mOhsL9C_jU16YSPMAXUBM8s2_m4_U,1128
 fleetfinder/views.py,sha256=cWjkmZACn2lS1aSxnxC7qm_a2G-9U4x-6dzIfJID_K0,9723
@@ -66,8 +65,9 @@ fleetfinder/tests/test_access.py,sha256=rQAfeEre2CmCszFTLV_53HK7m5Odq7ZqACJ3kced
 fleetfinder/tests/test_auth_hooks.py,sha256=XEB0LJmxxJCDlYhxKzcRiEHYrn1k_NkShrDGV_bcweg,2174
 fleetfinder/tests/test_settings.py,sha256=CuarOzsrkoMx7dmqolsnhnuhis7N10GaOULo6KYIl7k,710
 fleetfinder/tests/test_templatetags.py,sha256=lIe1X0TCuFwWcgsqZw4VGQLgqMsqEjNbPwqhtD8c4Qk,1414
+fleetfinder/tests/test_user_agent.py,sha256=sqKr_2IXoqULgqmFqoNV8fUR2Xv9QkA7On0Ae0FRuM8,1003
 fleetfinder/tests/utils.py,sha256=ynwH67jb14UFi6hpLAXe_FcYdQcjET_sxuUylWPNpnk,1451
-aa_fleetfinder-2.4.0.dist-info/METADATA,sha256=b_Tz-FDe1lEF5UCNF4KR40G4dk4BgyEIPtdhrK6SNAU,48063
-aa_fleetfinder-2.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-aa_fleetfinder-2.4.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-aa_fleetfinder-2.4.0.dist-info/RECORD,,
+aa_fleetfinder-2.5.0.dist-info/METADATA,sha256=dtRh2Ymgqhg1dgsurzH3smJFXsfEN1HgdD13cy9-U54,48096
+aa_fleetfinder-2.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+aa_fleetfinder-2.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+aa_fleetfinder-2.5.0.dist-info/RECORD,,

fleetfinder/__init__.py

@@ -5,6 +5,13 @@ Initialize the app
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.4.0"
+__version__ = "2.5.0"
 __title__ = _("Fleet Finder")
 __verbose_name__ = "Fleet Finder for Alliance Auth"
+
+__package_name__ = "aa-fleetfinder"
+__app_name__ = "fleetfinder"
+__app_name_verbose__ = "AA Fleet Finder"
+__app_name_useragent__ = "AA-Fleet-Finder"
+
+__github_url__ = f"https://github.com/ppfeufer/{__package_name__}"

fleetfinder/providers.py

@@ -6,7 +6,9 @@ Providers
 from esi.clients import EsiClientProvider
 
 # AA Fleet Finder
-from fleetfinder.constants import USER_AGENT
+from fleetfinder import __app_name_useragent__, __github_url__, __version__
 
 # ESI client
-esi = EsiClientProvider(app_info_text=USER_AGENT)
+esi = EsiClientProvider(
+    ua_appname=__app_name_useragent__, ua_version=__version__, ua_url=__github_url__
+)

fleetfinder/tests/test_user_agent.py

@@ -0,0 +1,40 @@
+"""
+Test user agent header for ESI requests
+"""
+
+# Django
+from django.conf import settings
+from django.test import TestCase
+
+# Alliance Auth
+from esi import __url__ as esi_url
+from esi import __version__ as esi_version
+
+# AA Fleet Finder
+from fleetfinder import __app_name_useragent__, __github_url__, __version__
+from fleetfinder.providers import esi
+
+
+class TestUserAgent(TestCase):
+    """
+    Test the user agent header for ESI requests
+    """
+
+    def test_user_agent_header(self):
+        """
+        Test that the user agent header is set correctly for ESI requests.
+
+        :return:
+        :rtype:
+        """
+
+        operation = esi.client.Universe.get_universe_factions()
+
+        self.assertEqual(
+            operation.future.request.headers["User-Agent"],
+            (
+                f"{__app_name_useragent__}/{__version__} "
+                f"({settings.ESI_USER_CONTACT_EMAIL}; +{__github_url__}) "
+                f"Django-ESI/{esi_version} (+{esi_url})"
+            ),
+        )

fleetfinder/constants.py

@@ -1,22 +0,0 @@
-"""
-Constants used in this app
-"""
-
-# Standard Library
-import os
-
-# Alliance Auth
-from esi import __version__ as esi_version
-
-# AA Fleet Finder
-from fleetfinder import __version__
-
-APP_NAME = "aa-fleetfinder"
-APP_NAME_VERBOSE = "AA Fleet Finder"
-APP_NAME_VERBOSE_USERAGENT = "AA-Fleet-Finder"
-PACKAGE_NAME = "fleetfinder"
-GITHUB_URL = f"https://github.com/ppfeufer/{APP_NAME}"
-USER_AGENT = f"{APP_NAME_VERBOSE_USERAGENT}/{__version__} (+{GITHUB_URL}) Django-ESI/{esi_version}"
-
-APP_BASE_DIR = os.path.join(os.path.dirname(__file__))
-APP_STATIC_DIR = os.path.join(APP_BASE_DIR, "static", PACKAGE_NAME)