MouseTools 3.1.0.dev1__tar.gz → 3.1.0.dev2__tar.gz

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2/MouseTools.egg-info}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: MouseTools
-Version: 3.1.0.dev1
+Version: 3.1.0.dev2
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 Project-URL: repository, https://gitlab.com/caratozzoloxyz/public/MouseTools
+Project-URL: documentation, https://caratozzoloxyz.gitlab.io/public/MouseTools/
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{mousetools-3.1.0.dev1/MouseTools.egg-info → mousetools-3.1.0.dev2}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: MouseTools
-Version: 3.1.0.dev1
+Version: 3.1.0.dev2
 Summary: An unofficial Python wrapper for Disney's API
 Author: Scott Caratozzolo
 Project-URL: repository, https://gitlab.com/caratozzoloxyz/public/MouseTools
+Project-URL: documentation, https://caratozzoloxyz.gitlab.io/public/MouseTools/
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/mousetools/__init__.py

@@ -3,5 +3,5 @@ import logging
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
-__version__ = "3.1.0-dev.1"  # will be set at runtime
+__version__ = "3.1.0-dev.2"  # will be set at runtime
 logger.info(f"MouseTools version: {__version__}")

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/mousetools/entities/base.py

@@ -106,16 +106,17 @@ class EntityBase(DisneyAPIMixin, ThemeParkAPIMixin):
             return {
                 "lat": float(
                     self.disney_data["coordinates"]["Guest Entrance"]["gps"][
-                        "lattitude"
+                        "latitude"
                     ]
                 ),
                 "lng": float(
-                    self.disney_data["coordinates"]["Guest entrance"]["gps"][
+                    self.disney_data["coordinates"]["Guest Entrance"]["gps"][
                         "longitude"
                     ]
                 ),
             }
-        except KeyError:
+        except KeyError as e:
+            print(e)
             logger.debug("No coordinates found for %s", self.entity_id)
             return None
 

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/mousetools/entities/menu.py

@@ -1,4 +1,5 @@
 import typing
+
 from mousetools.entities.base import EntityBase
 from mousetools.ids import FacilityServiceEntityTypes
 
@@ -74,6 +75,8 @@ class MenuItem:
         except KeyError:
             return None
 
+        return None
+
 
 class Menu:
     def __init__(self, raw_menu_data: dict):

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/mousetools/entities/restaurant.py

@@ -1,7 +1,8 @@
+import logging
 import typing
+
 from mousetools.entities.base import EntityBase
 from mousetools.ids import FacilityServiceEntityTypes
-import logging
 
 logger = logging.getLogger(__name__)
 

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/mousetools/mixins/disney.py

@@ -30,8 +30,6 @@ class DisneyAPIMixin:
         logger.info("Sending request to %s", url)
         response = httpx.get(url, headers=auth_obj.get_headers())
         logger.debug("Response status: %s", response.status_code)
-        if response.status_code == httpx._status_codes.codes.NOT_FOUND:
-            raise EntityIDNotFoundError
 
         try:
             response.raise_for_status()
@@ -49,6 +47,8 @@ class DisneyAPIMixin:
             logger.debug("Sending new request to %s", url)
             response = httpx.get(url, headers=auth_obj.get_headers())
             logger.debug("Response status: %s", response.status_code)
+            if response.status_code == httpx._status_codes.codes.NOT_FOUND:
+                raise EntityIDNotFoundError
             response.raise_for_status()
             data = response.json()
 

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/pyproject.toml

@@ -1,7 +1,3 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "MouseTools"
 dynamic = ["version"]
@@ -21,6 +17,23 @@ classifiers = [
 
 [project.urls]
 repository = "https://gitlab.com/caratozzoloxyz/public/MouseTools"
+documentation = "https://caratozzoloxyz.gitlab.io/public/MouseTools/"
+
+[tool.uv]
+dev-dependencies = [
+    "mkdocs>=1.6.1",
+    "mkdocs-material>=9.5.33",
+    "mkdocstrings[python]>=0.25.2",
+    "mypy>=1.11.2",
+    "pre-commit>=3.5.0",
+    "pytest-cov>=5.0.0",
+    "pytest>=8.3.2",
+    "ruff>=0.6.3",
+]
+
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
 
 [tool.setuptools.dynamic]
 version = {attr = "mousetools.__version__"}
@@ -67,49 +80,64 @@ minor_tags = ["feat"]
 patch_tags = ["fix", "perf"]
 default_bump_level = 0
 
-[tool.semantic_release.remote]
-name = "origin"
-type = "gitlab"
-ignore_token_for_push = true
-insecure = false
-token = { env = "GITLAB_TOKEN" }
-
 [tool.semantic_release.publish]
-dist_glob_patterns = ["dist/*"]
 upload_to_vcs_release = false
 
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
 
 [tool.ruff]
 target-version = "py39"
+line-length = 120
 
 [tool.ruff.lint]
 select = [
-    "F",
-    "E",
-    "W",
-    "I",
-    "N",
+    # flake8-2020
+    "YTT",
+    # flake8-bandit
+    "S",
+    # flake8-bugbear
+    "B",
+    # flake8-builtins
     "A",
+    # flake8-comprehensions
     "C4",
-    "DTZ002", "DTZ003",
-    "G010",
-    "T20",
-    "ERA",
-    "PL",
+    # flake8-debugger
+    "T10",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+    # mccabe
+    "C90",
+    # pycodestyle
+    "E", "W",
+    # pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # ruff
+    "RUF",
 ]
-
 ignore = [
+    # LineTooLong
     "E501",
+    # DoNotAssignLambda
+    "E731",
 ]
 
-[tool.uv]
-dev-dependencies = [
-    "mkdocs>=1.6.1",
-    "mkdocs-material>=9.5.33",
-    "mkdocstrings[python]>=0.25.2",
-    "mypy>=1.11.2",
-    "pre-commit>=3.5.0",
-    "pytest-cov>=5.0.0",
-    "pytest>=8.3.2",
-    "ruff>=0.6.3",
-]
+[tool.ruff.lint.per-file-ignores]
+# Use of `assert` detected
+"**/tests/*" = ["S101"]
+
+
+[tool.mypy]
+python_version = "3.9"
+files = ["mousetools"]
+disallow_untyped_defs = "True"
+disallow_any_unimported = "True"
+no_implicit_optional = "True"
+check_untyped_defs = "True"
+warn_unused_ignores = "True"
+show_error_codes = "True"

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/mousetools/entities/__init__.py

@@ -8,13 +8,13 @@ from mousetools.entities.entertainment_venue import EntertainmentVenue
 from mousetools.entities.event import Event
 from mousetools.entities.guest_services import GuestServices
 from mousetools.entities.land import Land
+from mousetools.entities.menu import Menus
 from mousetools.entities.merchandise_facility import MerchandiseFacility
 from mousetools.entities.park import ThemePark, WaterPark
 from mousetools.entities.point_of_interest import PointOfInterest
 from mousetools.entities.resort import Resort
 from mousetools.entities.resort_area import ResortArea
 from mousetools.entities.restaurant import Restaurant
-from mousetools.entities.menu import Menus
 from mousetools.ids import DestinationIds
 
 WALT_DISNEY_WORLD_DESTINATION = Destination(DestinationIds.WALT_DISNEY_WORLD)

{mousetools-3.1.0.dev1 → mousetools-3.1.0.dev2}/tests/test_entities.py

@@ -13,13 +13,13 @@ from mousetools.entities.entertainment_venue import EntertainmentVenue
 from mousetools.entities.event import Event
 from mousetools.entities.guest_services import GuestServices
 from mousetools.entities.land import Land
+from mousetools.entities.menu import Menus
 from mousetools.entities.merchandise_facility import MerchandiseFacility
 from mousetools.entities.park import ThemePark, WaterPark
 from mousetools.entities.point_of_interest import PointOfInterest
 from mousetools.entities.resort import Resort
 from mousetools.entities.resort_area import ResortArea
 from mousetools.entities.restaurant import Restaurant
-from mousetools.entities.menu import Menus
 from mousetools.ids import (
     DestinationIds,
     DisneylandResortParkIds,