Merge 6a6533b into 8ba1cdc

Fatal1ty · Sep 11, 2023 · ee7b64c · ee7b64c
2 parents 8ba1cdc + 6a6533b
commit ee7b64c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,13 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       - name: Install dependencies
         run: |
           pip install --upgrade pip
@@ -41,13 +42,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Install dependencies
       run: |
         pip install --upgrade pip
@@ -68,13 +70,14 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Install dependencies
       run: |
         pip install --upgrade pip

diff --git a/README.md b/README.md
@@ -109,7 +109,7 @@ Use pip to install:
 $ pip install mashumaro
 ```
 
-The current version of `mashumaro` supports Python versions 3.8 - 3.11.
+The current version of `mashumaro` supports Python versions 3.8 — 3.12.
 
 
 It's not recommended to use any version of Python that has reached its

diff --git a/mashumaro/jsonschema/models.py b/mashumaro/jsonschema/models.py
@@ -98,11 +98,7 @@ class JSONSchema(DataClassJSONMixin):
     enum: Optional[List[Any]] = None
     const: Optional[Any] = field(default_factory=lambda: MISSING)
     format: Optional[
-        Union[
-            JSONSchemaInstanceFormat,
-            JSONSchemaStringFormat,
-            JSONSchemaInstanceFormatExtension,
-        ]
+        Union[JSONSchemaStringFormat, JSONSchemaInstanceFormatExtension]
     ] = None
     title: Optional[str] = None
     description: Optional[str] = None

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -18,7 +18,7 @@ codespell>=2.2.2
 
 # third party features
 ciso8601>=2.1.3
-pendulum>=2.1.2
+pendulum>=2.1.2;python_version<'3.12'
 
 # benchmark
 pyperf>=2.6.1

diff --git a/setup.py b/setup.py
@@ -17,6 +17,7 @@
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Development Status :: 5 - Production/Stable",
     ],
     license="Apache License, Version 2.0",

diff --git a/tests/test_metadata_options.py b/tests/test_metadata_options.py
@@ -7,6 +7,7 @@
 import pytest
 
 from mashumaro import DataClassDictMixin
+from mashumaro.core.const import PY_312_MIN
 from mashumaro.exceptions import (
     UnserializableField,
     UnsupportedDeserializationEngine,
@@ -57,6 +58,7 @@ class DataClass(DataClassDictMixin):
     assert instance == should_be
 
 
+@pytest.mark.skip(reason="https://github.com/sdispater/pendulum/issues/696")
 def test_pendulum_datetime_parser():
     @dataclass
     class DataClass(DataClassDictMixin):
@@ -67,6 +69,7 @@ class DataClass(DataClassDictMixin):
     assert instance == should_be
 
 
+@pytest.mark.skip(reason="https://github.com/sdispater/pendulum/issues/696")
 def test_pendulum_date_parser():
     @dataclass
     class DataClass(DataClassDictMixin):
@@ -77,6 +80,7 @@ class DataClass(DataClassDictMixin):
     assert instance == should_be
 
 
+@pytest.mark.skip(reason="https://github.com/sdispater/pendulum/issues/696")
 def test_pendulum_time_parser():
     @dataclass
     class DataClass(DataClassDictMixin):