Merge branch 'master' into ai/alexjoeyyong/FSSDK-12958-local-holdout-flow-fix

Author: FarhanAnjum-opti

mypy.ini

@@ -9,7 +9,3 @@ exclude = (?x)(
   )
 show_error_codes = True
 pretty = True
-
-# suppress error on conditional import of typing_extensions module
-[mypy-optimizely.helpers.types]
-no_warn_unused_ignores = True

optimizely/bucketer.py

@@ -12,19 +12,12 @@
 # limitations under the License.
 
 from __future__ import annotations
-from typing import Optional, TYPE_CHECKING, cast
+from typing import Optional, TYPE_CHECKING, cast, Final
 import math
-from sys import version_info
 
 from .lib import pymmh3 as mmh3
 
 
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
-
 if TYPE_CHECKING:
     # prevent circular dependenacy by skipping import at runtime
     from .project_config import ProjectConfig

optimizely/decision/optimizely_decide_option.py

@@ -11,12 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sys import version_info
-
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
+from typing import Final
 
 
 class OptimizelyDecideOption:

optimizely/decision/optimizely_decision_message.py

@@ -11,12 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from sys import version_info
-
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
+from typing import Final
 
 
 class OptimizelyDecisionMessage:

optimizely/entities.py

@@ -11,13 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Optional, Sequence
-from sys import version_info
-
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
+from typing import TYPE_CHECKING, Any, Optional, Sequence, Final
 
 
 if TYPE_CHECKING:

optimizely/event/event_factory.py

@@ -12,8 +12,7 @@
 # limitations under the License.
 
 from __future__ import annotations
-from typing import TYPE_CHECKING, Optional, Sequence, cast, List
-from sys import version_info
+from typing import TYPE_CHECKING, Optional, Sequence, cast, List, Final
 from optimizely import entities
 from optimizely.helpers import enums
 from optimizely.helpers import event_tag_utils
@@ -23,11 +22,6 @@
 from . import payload
 from . import user_event
 
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
 if TYPE_CHECKING:
     # prevent circular dependenacy by skipping import at runtime
     from optimizely.project_config import ProjectConfig

optimizely/event/event_processor.py

@@ -17,10 +17,9 @@
 import threading
 import time
 
-from typing import Optional
+from typing import Optional, Final
 from datetime import timedelta
 import queue
-from sys import version_info
 
 from optimizely import logger as _logging
 from optimizely import notification_center as _notification_center
@@ -31,12 +30,6 @@
 from .user_event import UserEvent
 
 
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
-
 class BaseEventProcessor(ABC):
     """ Class encapsulating event processing. Override with your own implementation. """
 

optimizely/event/log_event.py

@@ -12,17 +12,10 @@
 # limitations under the License.
 
 from __future__ import annotations
-from typing import Optional, Any
-from sys import version_info
+from typing import Optional, Any, Literal
 from optimizely import event_builder
 
 
-if version_info < (3, 8):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
-
 class LogEvent(event_builder.Event):
     """ Representation of an event which can be sent to Optimizely events API. """
 

optimizely/event/user_event.py

@@ -13,18 +13,11 @@
 from __future__ import annotations
 import time
 import uuid
-from typing import TYPE_CHECKING, Optional
-from sys import version_info
+from typing import TYPE_CHECKING, Optional, Final
 
 from optimizely import version
 
 
-if version_info < (3, 8):
-    from typing_extensions import Final
-else:
-    from typing import Final
-
-
 if TYPE_CHECKING:
     # prevent circular dependenacy by skipping import at runtime
     from optimizely.entities import Experiment, Variation, Event, Holdout

optimizely/event_builder.py

@@ -13,21 +13,15 @@
 
 from __future__ import annotations
 import time
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Optional, Final, Literal
 import uuid
-from sys import version_info
 
 from . import version
 from .event import event_id_normalizer
 from .helpers import enums
 from .helpers import event_tag_utils
 from .helpers import validator
 
-if version_info < (3, 8):
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal
-
 if TYPE_CHECKING:
     # prevent circular dependenacy by skipping import at runtime
     from .entities import Experiment