From f7a6eda6f151d6df8db987425c25459dc87c7b20 Mon Sep 17 00:00:00 2001
From: Tom Schraitle <tomschr@users.noreply.github.com>
Date: Thu, 10 Nov 2022 11:33:23 +0100
Subject: [PATCH 1/2] CI: Update GH Actions

* Use v3 for some Actions
* Move to 3.11 instead of RC
---
 .github/workflows/python-testing.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/python-testing.yml b/.github/workflows/python-testing.yml
index 336e4980..48352b12 100644
--- a/.github/workflows/python-testing.yml
+++ b/.github/workflows/python-testing.yml
@@ -11,7 +11,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Output env variables
         run: |
            echo "Default branch=${default-branch}"
@@ -32,7 +32,7 @@ jobs:
            echo "\n"
            echo "::debug::---end"
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.7
       - name: Install dependencies
@@ -49,14 +49,19 @@ jobs:
     strategy:
       max-parallel: 5
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-rc.2",
+        python-version: ["3.6",
+                         "3.7",
+                         "3.8",
+                         "3.9",
+                         "3.10",
+                         "3.11",
                          # "3.12"
                          ]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

From 98e845c804635ad533bd1cc7707297c5c1af9dd9 Mon Sep 17 00:00:00 2001
From: Tom Schraitle <tomschr@users.noreply.github.com>
Date: Thu, 10 Nov 2022 14:27:09 +0100
Subject: [PATCH 2/2] Add missing Optional type annotation

---
 src/semver/__main__.py    | 4 ++--
 src/semver/_deprecated.py | 8 ++++----
 src/semver/cli.py         | 4 ++--
 src/semver/version.py     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/semver/__main__.py b/src/semver/__main__.py
index 7fde54d7..a6d448aa 100644
--- a/src/semver/__main__.py
+++ b/src/semver/__main__.py
@@ -11,12 +11,12 @@
 """
 import os.path
 import sys
-from typing import List
+from typing import List, Optional
 
 from semver import cli
 
 
-def main(cliargs: List[str] = None) -> int:
+def main(cliargs: Optional[List[str]] = None) -> int:
     if __package__ == "":
         path = os.path.dirname(os.path.dirname(__file__))
         sys.path[0:0] = [path]
diff --git a/src/semver/_deprecated.py b/src/semver/_deprecated.py
index 61ceae12..5f51c8f3 100644
--- a/src/semver/_deprecated.py
+++ b/src/semver/_deprecated.py
@@ -7,7 +7,7 @@
 import warnings
 from functools import partial, wraps
 from types import FrameType
-from typing import Type, Callable, cast
+from typing import Type, Callable, Optional, cast
 
 from . import cli
 from .version import Version
@@ -15,9 +15,9 @@
 
 
 def deprecated(
-    func: F = None,
-    replace: str = None,
-    version: str = None,
+    func: Optional[F] = None,
+    replace: Optional[str] = None,
+    version: Optional[str] = None,
     category: Type[Warning] = DeprecationWarning,
 ) -> Decorator:
     """
diff --git a/src/semver/cli.py b/src/semver/cli.py
index 65ca5187..3c573d63 100644
--- a/src/semver/cli.py
+++ b/src/semver/cli.py
@@ -12,7 +12,7 @@
 
 import argparse
 import sys
-from typing import cast, List
+from typing import cast, List, Optional
 
 from .version import Version
 from .__about__ import __version__
@@ -152,7 +152,7 @@ def process(args: argparse.Namespace) -> str:
     return args.func(args)
 
 
-def main(cliargs: List[str] = None) -> int:
+def main(cliargs: Optional[List[str]] = None) -> int:
     """
     Entry point for the application script.
 
diff --git a/src/semver/version.py b/src/semver/version.py
index 34eb51e0..04e7faae 100644
--- a/src/semver/version.py
+++ b/src/semver/version.py
@@ -107,8 +107,8 @@ def __init__(
         major: SupportsInt,
         minor: SupportsInt = 0,
         patch: SupportsInt = 0,
-        prerelease: Union[String, int] = None,
-        build: Union[String, int] = None,
+        prerelease: Optional[Union[String, int]] = None,
+        build: Optional[Union[String, int]] = None,
     ):
         # Build a dictionary of the arguments except prerelease and build
         version_parts = {"major": int(major), "minor": int(minor), "patch": int(patch)}