Merge branch 'release/1.0.2'

fgmacedo · fgmacedo · commit 04f7662cefc0 · 2023-01-12T21:47:52.000-03:00
diff --git a/docs/auto_examples/all_actions_machine.ipynb b/docs/auto_examples/all_actions_machine.ipynb
@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')"
+        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')\n# import patch_repr_svg"
       ]
     },
     {
diff --git a/docs/auto_examples/guess_the_number_machine.ipynb b/docs/auto_examples/guess_the_number_machine.ipynb
@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')"
+        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')\n# import patch_repr_svg"
       ]
     },
     {
diff --git a/docs/auto_examples/index.rst b/docs/auto_examples/index.rst
@@ -6,7 +6,7 @@ Examples
 Below is a gallery of StateMachine examples.
 
 
-.. tip:: Try Python State Machine directly from your browser!
+.. tip:: Try Python State Machine directly from your browser! (experimental)
 
     Run our examples and try hacks right now on this `JupyterLab <../lite/lab/index.html>`_
 
diff --git a/docs/auto_examples/order_control_machine.ipynb b/docs/auto_examples/order_control_machine.ipynb
@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')"
+        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')\n# import patch_repr_svg"
       ]
     },
     {
diff --git a/docs/auto_examples/order_control_rich_model_machine.ipynb b/docs/auto_examples/order_control_rich_model_machine.ipynb
@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')"
+        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')\n# import patch_repr_svg"
       ]
     },
     {
diff --git a/docs/auto_examples/order_control_rich_model_machine.rst b/docs/auto_examples/order_control_rich_model_machine.rst
@@ -214,7 +214,7 @@ Since there's still $6 left to fulfill the payment, we cannot process the order.
  .. code-block:: none
 
 
-    OrderControl(model=<__main__.Order object at 0x7fe51b7b5fd0>, state_field='state', current_state='waiting_for_payment')
+    OrderControl(model=<__main__.Order object at 0x7f5730b462e0>, state_field='state', current_state='waiting_for_payment')
 
 
 
@@ -258,7 +258,7 @@ Now paying the left amount, we can proceed.
  .. code-block:: none
 
 
-    OrderControl(model=<__main__.Order object at 0x7fe51b7b5fd0>, state_field='state', current_state='processing')
+    OrderControl(model=<__main__.Order object at 0x7f5730b462e0>, state_field='state', current_state='processing')
 
 
 
@@ -292,7 +292,7 @@ Now paying the left amount, we can proceed.
  .. code-block:: none
 
 
-    OrderControl(model=<__main__.Order object at 0x7fe51b7b5fd0>, state_field='state', current_state='shipping')
+    OrderControl(model=<__main__.Order object at 0x7f5730b462e0>, state_field='state', current_state='shipping')
 
 
 
@@ -391,7 +391,7 @@ Just checking the final expected state
  .. code-block:: none
 
 
-    OrderControl(model=<__main__.Order object at 0x7fe51b7b5fd0>, state_field='state', current_state='completed')
+    OrderControl(model=<__main__.Order object at 0x7f5730b462e0>, state_field='state', current_state='completed')
 
 
 
diff --git a/docs/auto_examples/traffic_light_machine.ipynb b/docs/auto_examples/traffic_light_machine.ipynb
@@ -8,7 +8,7 @@
       },
       "outputs": [],
       "source": [
-        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')"
+        "# import piplite\n# await piplite.install('python-statemachine[diagrams]')\n# import patch_repr_svg"
       ]
     },
     {
diff --git a/docs/releases/1.0.2.md b/docs/releases/1.0.2.md
@@ -0,0 +1,14 @@
+# StateMachine 1.0.2
+
+*January 12, 2023*
+
+
+StateMachine 1.0.2 fixes a regression bug blocking the library usage on
+Python 3.11.
+
+
+## Bugfixes
+
+- Fixes [#316](https://github.com/fgmacedo/python-statemachine/issues/316) a bad
+  import of 'inspect.getargspec' that was removed on Python 3.11,
+  still backwards compatible with older versions.
diff --git a/docs/releases/index.md b/docs/releases/index.md
@@ -15,6 +15,7 @@ Below are release notes through StateMachine and its patch releases.
 ```{toctree}
 :maxdepth: 1
 
+1.0.2
 1.0.1
 1.0.0
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.2
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 setup(
     name="python-statemachine",
-    version="1.0.1",
+    version="1.0.2",
     description="Python Finite State Machines made easy.",
     long_description=long_description,
     author="Fernando Macedo",
diff --git a/statemachine/__init__.py b/statemachine/__init__.py
@@ -7,6 +7,6 @@
 
 __author__ = """Fernando Macedo"""
 __email__ = "fgmacedo@gmail.com"
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 __all__ = ["StateMachine", "State"]
diff --git a/statemachine/dispatcher.py b/statemachine/dispatcher.py
@@ -31,8 +31,11 @@ def methodcaller(method):
     # args is a list of the argument names (it may contain nested lists)
     # varargs and keywords are the names of the * and ** arguments or None
     # defaults is a tuple of default argument values or None if there are no default arguments
-    spec = inspect.getargspec(method)
-    keywords = spec.keywords
+    try:
+        spec = inspect.getfullargspec(method)
+    except AttributeError:  # pragma: no cover
+        spec = inspect.getargspec(method)
+    keywords = getattr(spec, "varkw", getattr(spec, "keywords", None))
     expected_args = list(spec.args)
     expected_kwargs = spec.defaults or {}
 
diff --git a/tests/examples/README.rst b/tests/examples/README.rst
@@ -4,7 +4,7 @@ Examples
 Below is a gallery of StateMachine examples.
 
 
-.. tip:: Try Python State Machine directly from your browser!
+.. tip:: Try Python State Machine directly from your browser! (experimental)
 
     Run our examples and try hacks right now on this `JupyterLab <../lite/lab/index.html>`_
 
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, py37, py38, lint
+envlist = py27, py35, py36, py37, py38, py39, py310, py311, lint
 
 [testenv]
 setenv =
@@ -28,8 +28,20 @@ commands =
 
 basepython =
     lint: python3.8
+    py311: python3.11
+    py310: python3.10
+    py39: python3.9
     py38: python3.8
     py37: python3.7
     py36: python3.6
     py35: python3.5
     py27: python2.7
+
+[testenv:py311]
+deps =
+    pytest>5
+    pytest-cov
+    pytest-flake8
+    flake8==3.7.9
+    pydot
+    mock

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`},`
`9`	`9`	`"outputs": [],`
`10`	`10`	`"source": [`
`11`		`- "# import piplite\n# await piplite.install('python-statemachine[diagrams]')"`
	`11`	`+ "# import piplite\n# await piplite.install('python-statemachine[diagrams]')\n# import patch_repr_svg"`
`12`	`12`	`]`
`13`	`13`	`},`
`14`	`14`	`{`