Upgrade: Bump the dependencies group across 1 directory with 23 updates (#509)

* Upgrade: Bump the dependencies group across 1 directory with 23 updates

---
updated-dependencies:
- dependency-name: aioauth-client
  dependency-version: 0.30.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aiohappyeyeballs
  dependency-version: 2.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: aiohttp
  dependency-version: 3.12.13
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: anyio
  dependency-version: 4.9.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: attrs
  dependency-version: 25.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: boto3
  dependency-version: 1.38.37
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: botocore
  dependency-version: 1.38.37
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: certifi
  dependency-version: 2025.6.15
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: charset-normalizer
  dependency-version: 3.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: cryptography
  dependency-version: 45.0.4
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: frozenlist
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: h11
  dependency-version: 0.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: httpcore
  dependency-version: 1.0.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: marshmallow
  dependency-version: 4.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: multidict
  dependency-version: 6.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: packaging
  dependency-version: '25.0'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: dependencies
- dependency-name: propcache
  dependency-version: 0.3.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: requests
  dependency-version: 2.32.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: dependencies
- dependency-name: s3transfer
  dependency-version: 0.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: sentry-sdk
  dependency-version: 2.30.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: typing-extensions
  dependency-version: 4.14.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: uritemplate
  dependency-version: 4.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
- dependency-name: yarl
  dependency-version: 1.20.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>

* Codechange: remove dependency on marshmallow-enum

It is now integrated in marshmallow, so also no longer a need.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Patric Stout <[email protected]>

Author: dependabot[bot]

bananas_api/helpers/api_schema.py

@@ -7,7 +7,6 @@
     validates_schema,
 )
 from marshmallow.exceptions import ValidationError
-from marshmallow_enum import EnumField
 
 from .content_storage import get_indexed_package
 from .enums import (
@@ -122,7 +121,7 @@ class Authors(OrderedSchema):
 
 
 class Dependency(OrderedSchema):
-    content_type = EnumField(ContentType, data_key="content-type", by_value=True)
+    content_type = fields.Enum(ContentType, data_key="content-type", by_value=True)
     unique_id = fields.String(data_key="unique-id", validate=validate.Length(equal=8))
     md5sum_partial = fields.String(data_key="md5sum-partial", validate=validate.Length(equal=8))
 
@@ -150,7 +149,7 @@ def validate_dependency(self, data, **kwargs):
 
 
 class Compatability(OrderedSchema):
-    name = EnumField(Branch, by_value=True)
+    name = fields.Enum(Branch, by_value=True)
     conditions = fields.List(fields.String(), validate=validate.Length(min=1, max=2))
 
     @validates("conditions")
@@ -207,36 +206,36 @@ def validate_conditions(self, data, **kwargs):
 
 
 class Classification(OrderedSchema):
-    set = EnumField(NewGRFSet, by_value=True)
-    palette = EnumField(Palette, by_value=True)
+    set = fields.Enum(NewGRFSet, by_value=True)
+    palette = fields.Enum(Palette, by_value=True)
     has_high_res = fields.Boolean(data_key="has-high-res")
     has_sound_effects = fields.Boolean(data_key="has-sound-effects")
-    shape = EnumField(Shape, by_value=True)
-    resolution = EnumField(Resolution, by_value=True)
-    terrain_type = EnumField(TerrainType, by_value=True, data_key="terrain-type")
-    size = EnumField(Size, by_value=True)
-    climate = EnumField(Climate, by_value=True)
+    shape = fields.Enum(Shape, by_value=True)
+    resolution = fields.Enum(Resolution, by_value=True)
+    terrain_type = fields.Enum(TerrainType, by_value=True, data_key="terrain-type")
+    size = fields.Enum(Size, by_value=True)
+    climate = fields.Enum(Climate, by_value=True)
 
 
 class VersionMinimized(Global):
     read_only = ["upload_date", "md5sum_partial", "classification", "filesize", "license", "availability"]
     read_only_for_new = ["upload_date", "md5sum_partial", "classification", "filesize", "availability"]
 
     version = fields.String(validate=ValidateBytesLength(max=15))
-    license = EnumField(License, by_value=True)
+    license = fields.Enum(License, by_value=True)
     upload_date = fields.DateTime(data_key="upload-date", format="iso")
     md5sum_partial = fields.String(data_key="md5sum-partial", validate=validate.Length(equal=8))
     classification = fields.Nested(Classification())
     filesize = fields.Integer()
-    availability = EnumField(Availability, by_value=True)
+    availability = fields.Enum(Availability, by_value=True)
     dependencies = fields.List(fields.Nested(Dependency()))
     compatibility = fields.List(fields.Nested(Compatability()))
 
 
 class Package(Global):
     read_only = ["content_type", "unique_id", "archived", "replaced_by"]
 
-    content_type = EnumField(ContentType, data_key="content-type", by_value=True)
+    content_type = fields.Enum(ContentType, data_key="content-type", by_value=True)
     unique_id = fields.String(data_key="unique-id", validate=validate.Length(equal=8))
     authors = fields.List(fields.Nested(Author))
     versions = fields.List(fields.Nested(VersionMinimized))
@@ -245,7 +244,7 @@ class Package(Global):
 class Version(VersionMinimized):
     read_only = ["content_type", "unique_id"]
 
-    content_type = EnumField(ContentType, data_key="content-type", by_value=True)
+    content_type = fields.Enum(ContentType, data_key="content-type", by_value=True)
     unique_id = fields.String(data_key="unique-id", validate=validate.Length(equal=8))
 
 
@@ -260,7 +259,7 @@ class UploadStatus(Version):
     files = fields.List(fields.Nested(UploadStatusFiles))
     warnings = fields.List(fields.String)
     errors = fields.List(fields.String)
-    status = EnumField(Status, by_value=True)
+    status = fields.Enum(Status, by_value=True)
 
 
 class UploadNew(OrderedSchema):

regression/920_invalid_license.yaml

@@ -6,4 +6,4 @@ steps:
   version: "test"
   license: "My License"
   error:
-    license: "Invalid enum value My License"
+    license: "Must be one of: GPL v2, GPL v3, LGPL v2.1, CC-0 v1.0, CC-BY v3.0, CC-BY-SA v3.0, CC-BY-NC-SA v3.0, CC-BY-NC-ND v3.0, Custom."

regression_runner/requirements.txt

@@ -1,20 +1,20 @@
-aiohappyeyeballs==2.4.6
-aiohttp==3.11.12
+aiohappyeyeballs==2.6.1
+aiohttp==3.12.13
 aiosignal==1.3.2
-attrs==25.1.0
-certifi==2025.1.31
-charset-normalizer==3.4.1
+attrs==25.3.0
+certifi==2025.6.15
+charset-normalizer==3.4.2
 click==8.1.8
 coloredlogs==15.0.1
-frozenlist==1.5.0
+frozenlist==1.7.0
 humanfriendly==10.0
 idna==3.10
-multidict==6.1.0
-propcache==0.2.1
+multidict==6.5.0
+propcache==0.3.2
 PyYAML==6.0.2
-requests==2.32.3
+requests==2.32.4
 tinydb==4.8.2
 tuspy==1.1.0
 urllib3==2.3.0
 verboselogs==1.7
-yarl==1.18.3
+yarl==1.20.1

requirements.base

@@ -5,7 +5,6 @@ click
 github3.py
 gitpython
 marshmallow
-marshmallow-enum
 openttd-helpers
 python-dateutil
 PyYAML

requirements.txt

@@ -1,42 +1,41 @@
-aioauth-client==0.29.0
-aiohappyeyeballs==2.4.6
-aiohttp==3.11.12
+aioauth-client==0.30.1
+aiohappyeyeballs==2.6.1
+aiohttp==3.12.13
 aiosignal==1.3.2
-anyio==4.8.0
-attrs==25.1.0
-boto3==1.36.21
-botocore==1.36.21
-certifi==2025.1.31
+anyio==4.9.0
+attrs==25.3.0
+boto3==1.38.37
+botocore==1.38.37
+certifi==2025.6.15
 cffi==1.17.1
-charset-normalizer==3.4.1
+charset-normalizer==3.4.2
 click==8.1.8
-cryptography==44.0.1
-frozenlist==1.5.0
+cryptography==45.0.4
+frozenlist==1.7.0
 gitdb==4.0.12
 github3.py==4.0.1
 GitPython==3.1.44
-h11==0.14.0
-httpcore==1.0.7
+h11==0.16.0
+httpcore==1.0.9
 httpx==0.28.1
 idna==3.10
 jmespath==1.0.1
-marshmallow==3.26.1
-marshmallow-enum==1.5.1
-multidict==6.1.0
+marshmallow==4.0.0
+multidict==6.5.0
 openttd-helpers==1.4.0
-packaging==24.2
-propcache==0.2.1
+packaging==25.0
+propcache==0.3.2
 pycparser==2.22
 PyJWT==2.10.1
 python-dateutil==2.9.0.post0
 PyYAML==6.0.2
-requests==2.32.3
-s3transfer==0.11.2
-sentry-sdk==2.21.0
+requests==2.32.4
+s3transfer==0.13.0
+sentry-sdk==2.30.0
 six==1.17.0
 smmap==5.0.2
 sniffio==1.3.1
-typing_extensions==4.12.2
-uritemplate==4.1.1
+typing_extensions==4.14.0
+uritemplate==4.2.0
 urllib3==2.2.3
-yarl==1.18.3
+yarl==1.20.1