aa-fleetfinder 2.4.0__tar.gz → 2.5.0__tar.gz

{aa_fleetfinder-2.4.0 → aa_fleetfinder-2.5.0}/PKG-INFO

@@ -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.5.0/fleetfinder/__init__.py

@@ -0,0 +1,17 @@
+"""
+Initialize the app
+"""
+
+# Django
+from django.utils.translation import gettext_lazy as _
+
+__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__}"

aa_fleetfinder-2.5.0/fleetfinder/providers.py

@@ -0,0 +1,14 @@
+"""
+Providers
+"""
+
+# Alliance Auth
+from esi.clients import EsiClientProvider
+
+# AA Fleet Finder
+from fleetfinder import __app_name_useragent__, __github_url__, __version__
+
+# ESI client
+esi = EsiClientProvider(
+    ua_appname=__app_name_useragent__, ua_version=__version__, ua_url=__github_url__
+)

aa_fleetfinder-2.5.0/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})"
+            ),
+        )

{aa_fleetfinder-2.4.0 → aa_fleetfinder-2.5.0}/pyproject.toml

@@ -40,6 +40,7 @@ dynamic = [
 dependencies = [
     "allianceauth>=4.6,<5",
     "allianceauth-app-utils>=1.14.2",
+    "django-esi>=7.0.1",
 ]
 optional-dependencies.tests-allianceauth-latest = [
     "coverage",

aa_fleetfinder-2.4.0/fleetfinder/__init__.py

@@ -1,10 +0,0 @@
-"""
-Initialize the app
-"""
-
-# Django
-from django.utils.translation import gettext_lazy as _
-
-__version__ = "2.4.0"
-__title__ = _("Fleet Finder")
-__verbose_name__ = "Fleet Finder for Alliance Auth"

aa_fleetfinder-2.4.0/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)

aa_fleetfinder-2.4.0/fleetfinder/providers.py

@@ -1,12 +0,0 @@
-"""
-Providers
-"""
-
-# Alliance Auth
-from esi.clients import EsiClientProvider
-
-# AA Fleet Finder
-from fleetfinder.constants import USER_AGENT
-
-# ESI client
-esi = EsiClientProvider(app_info_text=USER_AGENT)