optimism 3.1.1__tar.gz → 3.1.2__tar.gz

{optimism-3.1.1 → optimism-3.1.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: optimism
-Version: 3.1.1
-Summary: Very simple testing framework suitable for beginner programmers, with easy functions for accomplishing most common testing tasks like providing input. Requires Python 3.11+.
+Version: 3.1.2
+Summary: Very simple testing framework suitable for beginner programmers, with easy functions for accomplishing most common testing tasks like providing input. Requires Python 3.8+.
 Home-page: https://cs.wellesley.edu/~pmwh/optimism/docs/optimism.html
 Author: Peter Mawhorter
 Author-email: pmawhort@wellesley.edu
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
 Classifier: Topic :: Education
-Requires-Python: >=3.11
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Provides-Extra: test

optimism-3.1.2/optimism/__init__.py

@@ -0,0 +1,21 @@
+"""
+This package init just imports everything from optimism.py, including
+explicitly the version number (which otherwise would be skipped since it
+starts with '_'). That way, importing optimism-the-package is the same as
+importing optimism-the-file, except that private variables are not
+exported by the package. So you can distribute the package OR just the
+optimism.py file and both should work the same.
+"""
+
+from .optimism import *
+
+# Setuptools versions on Python 3.10 won't allow us to just import the
+# version from optimism, but we want the version to be defined in that
+# file so that a single-file distribution is equivalent to this packaged
+# distribution. So we define a version here as well, but...
+__version__ = "3.1.2"
+
+# ...then we assert it matches so testing will catch it if I forget to
+# keep them in sync before a release. T_T
+from .optimism import __version__ as match
+assert __version__ == match

{optimism-3.1.1 → optimism-3.1.2}/optimism/optimism.py

@@ -200,6 +200,8 @@ TODO: Workaround for tracing in interactive console?
 
 ## Changelog
 
+- Version 3.1.2 Adds shims to support Python versions 3.8-3.10 again,
+  rather than just 3.11+.
 - Version 3.1.1 reformulates the module as a package so that it can add
   a `py.typed` file so that the new type hints are recognized by `mypy`.
   The package version no longer exports private names from the
@@ -344,14 +346,14 @@ TODO: Workaround for tracing in interactive console?
 
 # TODO: Cache compiled ASTs!
 
-__version__ = "3.1.1"
+__version__ = "3.1.2"
 
 from typing import (
-    Any, Dict, List, Optional, Tuple, TypeAlias, Literal as LiteralType,
-    Callable, TypedDict, cast, Iterable, Iterator, Protocol, TextIO,
-    Union, Sequence, Type, TypeVar, Generic, Collection, Set, get_args
+    Any, Dict, List, Optional, Tuple, Literal as LiteralType, Callable,
+    TypedDict, cast, Iterable, Iterator, Protocol, TextIO, Union,
+    Sequence, TypeVar, Generic, Collection, Set, get_args
 )
-from types import NoneType, FunctionType, ModuleType, FrameType
+from types import FunctionType, ModuleType, FrameType
 
 import sys, traceback, inspect, linecache, ast, copy, io, os, re, types,\
        builtins, cmath, textwrap, warnings, functools, token, tokenize
@@ -359,18 +361,27 @@ import sys, traceback, inspect, linecache, ast, copy, io, os, re, types,\
 import doctest
 from typing import Callable, Any
 
+#------------------#
+# Version Handling #
+#------------------# 
 
 # Flags for feature-detection on the ast module
 HAS_WALRUS = hasattr(ast, "NamedExpr")
 SPLIT_CONSTANTS = hasattr(ast, "Num")
 
+# Type is required before 3.9 but deprecated in that version
+if sys.version_info >= (3, 9):
+    Type = type
+else:
+    from typing import Type
+
 
-#
+# Versions of Python before 3.11 don't support Unpack
 try:
     from typing import Unpack
 except ImportError:
     # We need to ignore "already defined by import" error here
-    class Unpack:  # type: ignore
+    class UnpackShim:  # type: ignore
         """
         A fake stub for `typing.Unpack` on Python versions where that's
         not available; allows get-item just like `Unpack` but returns
@@ -379,6 +390,19 @@ except ImportError:
         def __getitem__(self, _):
             return Any
 
+    Unpack = UnpackShim()
+
+# Versions of Python before 3.10 don't support TypeAlias
+try:
+    from typing import TypeAlias
+except ImportError:
+    TypeAlias = Type
+
+# Versions of Python before 3.10 don't support NoneType
+try:
+    from types import NoneType
+except ImportError:
+    NoneType = type(None)
 
 #----------------#
 # Monkey Patches #
@@ -698,7 +722,10 @@ Type variable for `ClassInfo` definition.
 """
 
 
-ClassInfo: TypeAlias = Union[type[T], Tuple['ClassInfo', ...], type[Union]]
+if sys.version_info > (3, 10):
+    ClassInfo: TypeAlias = Union[Type[T], Tuple['ClassInfo', ...], Type[Union]]
+else:
+    ClassInfo: TypeAlias = Union[Type[T], Tuple['ClassInfo', ...]]
 """
 The kinds of things that can be passed as the second argument of
 `instanceof`: types, tuples of types (perhaps nested) and `Union`s.
@@ -4839,7 +4866,7 @@ class NumArgs(TypedDict, total=False):
     types which inherit from `ASTRequirement` can use it as the type of
     their **kwargs. All slots are optional.
     """
-    min: Union[type[DefaultMin], None, int]
+    min: Union[Type[DefaultMin], None, int]
     max: Optional[int]
     n: Optional[int]
 
@@ -4874,7 +4901,7 @@ class ASTRequirement:
     def __init__(
         self,
         *,
-        min: Union[type[DefaultMin], None, int] = DefaultMin,
+        min: Union[Type[DefaultMin], None, int] = DefaultMin,
         max: Optional[int] = None,
         n: Optional[int] = None
     ):
@@ -6294,7 +6321,7 @@ class Constant(ASTRequirement):
     def __init__(
         self,
         value: Any = AnyValue,
-        types: Union[type, Tuple[type, ...], type[AnyType]] = AnyType,
+        types: Union[type, Tuple[type, ...], Type[AnyType]] = AnyType,
         **kwargs: Unpack[NumArgs]
     ) -> None:
         """
@@ -6427,7 +6454,7 @@ A union of the types which can be declared as literals.
 
 def getLiteralValue(astNode: ast.AST) -> Union[
     LiterallyDeclarable,
-    type[AnyValue]
+    Type[AnyValue]
 ]:
     """
     For an AST node that's entirely made up of `Constant` and/or
@@ -6521,7 +6548,7 @@ class Literal(ASTRequirement):
     def __init__(
         self,
         value: Any = AnyValue,
-        types: Union[type, Tuple[type, ...], type[AnyType]] = AnyType,
+        types: Union[type, Tuple[type, ...], Type[AnyType]] = AnyType,
         **kwargs: Unpack[NumArgs]
     ) -> None:
         """
@@ -6669,7 +6696,7 @@ class Literal(ASTRequirement):
 
                 # Coerce type of our own value to type of the value provided
                 valType = cast(
-                    Union[type[set], type[list], type[tuple], type[dict]],
+                    Union[Type[set], Type[list], Type[tuple], Type[dict]],
                     valType
                 )
                 checkAgainst = valType(self.value)
@@ -6744,8 +6771,8 @@ A type variable for types that are ast.AST subtypes.
 """
 
 OpMapEntry: TypeAlias = Tuple[
-    Tuple[type[ast.AST], ...],
-    Tuple[type[ast.AST], ...]
+    Tuple[Type[ast.AST], ...],
+    Tuple[Type[ast.AST], ...]
 ]
 """
 The generic type for entries in our `OP_MAP` operator mapping
@@ -6871,14 +6898,14 @@ class SpecificNode(ASTRequirement, Generic[AT]):
     string, so other `ASTRequirement` sub-classes are preferable if one
     of them can match what you want.
     """
-    nodeTypes: Tuple[type[AT], ...]
+    nodeTypes: Tuple[Type[AT], ...]
     """
     The tuple of allowed `ast.AST` node types
     """
 
     def __init__(
         self,
-        nodeTypes: Union[type[AT], Sequence[type[AT]]],
+        nodeTypes: Union[Type[AT], Sequence[Type[AT]]],
         filterFunction: Optional[Callable[[ast.AST], bool]] = None,
         **kwargs: Unpack[NumArgs]
     ) -> None:
@@ -7112,22 +7139,21 @@ which has slots that used to contain complex sub-objects replaced with
 `MemReference` objects. See `memoryMap`.
 """
 
-
-SmallType: TypeAlias = Union[
-    int,
-    float,
-    complex,
-    bool,
-    NoneType  # type: ignore
-]
+SmallTypes: Tuple[Type] = (int, float, complex, bool, NoneType)
 """
 The object types which are small enough to fit into a single field
 without using a pointer in theory, which we thus represent without using
-a `MemReference` in a memory report.
+a `MemReference` in a memory report. This is a tuple so it can be used
+with `isinstance`.
+"""
+# Note that NoneType is used over None here because we use isinstance
+# later so it cannot just be None. If we only wanted to support Python
+# 3.10+, we could use the union directly in isinstance.
+
+SmallType: TypeAlias = Union[int, float, complex, bool, NoneType]
+"""
+A union of the `SmallTypes`.
 """
-# Note that NoneType is used over None here because we use get_args and
-# isinstance later so it cannot just be None. If we only wanted to
-# support Python 3.10+, we could use the union directly in isinstance.
 
 
 def memoryMap(
@@ -7194,7 +7220,7 @@ def memoryMap(
 
     shallow: Union[tuple, list, set, dict]
     if (
-        isinstance(obj, get_args(SmallType))
+        isinstance(obj, SmallTypes)
      or (INLINE_STRINGS_IN_MEMORY_REPORTS and isinstance(obj, str))
     ):
         # Simple values are used as-is:

{optimism-3.1.1 → optimism-3.1.2}/optimism.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: optimism
-Version: 3.1.1
-Summary: Very simple testing framework suitable for beginner programmers, with easy functions for accomplishing most common testing tasks like providing input. Requires Python 3.11+.
+Version: 3.1.2
+Summary: Very simple testing framework suitable for beginner programmers, with easy functions for accomplishing most common testing tasks like providing input. Requires Python 3.8+.
 Home-page: https://cs.wellesley.edu/~pmwh/optimism/docs/optimism.html
 Author: Peter Mawhorter
 Author-email: pmawhort@wellesley.edu
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
 Classifier: Topic :: Education
-Requires-Python: >=3.11
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Provides-Extra: test

{optimism-3.1.1 → optimism-3.1.2}/pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = [ "setuptools >= 69.0", "wheel" ]
+requires = [ "setuptools", "wheel" ]
 build-backend = "setuptools.build_meta"

{optimism-3.1.1 → optimism-3.1.2}/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = optimism
 version = attr: optimism.__version__
-description = Very simple testing framework suitable for beginner programmers, with easy functions for accomplishing most common testing tasks like providing input. Requires Python 3.11+.
+description = Very simple testing framework suitable for beginner programmers, with easy functions for accomplishing most common testing tasks like providing input. Requires Python 3.8+.
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://cs.wellesley.edu/~pmwh/optimism/docs/optimism.html
@@ -19,7 +19,7 @@ classifiers =
 	Topic :: Education
 
 [options]
-python_requires = >=3.11
+python_requires = >=3.8
 provides = optimism
 packages = optimism
 

optimism-3.1.1/optimism/__init__.py

@@ -1,12 +0,0 @@
-"""
-This package init just imports everything from optimism.py, including
-explicitly the version number (which otherwise would be skipped since it
-starts with '_'). That way, importing optimism-the-package is the same as
-importing optimism-the-file, except that private variables are not
-exported by the package. So you can distribute the package OR just the
-optimism.py file and both should work the same.
-"""
-
-from .optimism import *
-
-from .optimism import __version__