From fc0715c890b65719caf9687e7df05c87409e3e93 Mon Sep 17 00:00:00 2001 From: Scott Dixon Date: Sat, 28 Jan 2023 16:24:43 -0800 Subject: [PATCH] fix for #90, python 3.11 fixes (#91) --- appveyor.yml | 4 ++++ noxfile.py | 2 +- pydsdl/__init__.py | 2 +- pydsdl/third_party/parsimonious/expressions.py | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8a8d451..9460544 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,10 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: macos PYTHON: "3.9" + - job_group: tests + APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 + PYTHON: "3.11" + - job_group: tests APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 PYTHON: "3.10" diff --git a/noxfile.py b/noxfile.py index 6b67432..80a4504 100644 --- a/noxfile.py +++ b/noxfile.py @@ -9,7 +9,7 @@ import nox -PYTHONS = ["3.6", "3.7", "3.8", "3.9", "3.10"] +PYTHONS = ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"] """The newest supported Python shall be listed LAST.""" nox.options.error_on_external_run = True diff --git a/pydsdl/__init__.py b/pydsdl/__init__.py index 8db7022..11ca69a 100644 --- a/pydsdl/__init__.py +++ b/pydsdl/__init__.py @@ -7,7 +7,7 @@ import os as _os import sys as _sys -__version__ = "1.17.0" +__version__ = "1.18.0" __version_info__ = tuple(map(int, __version__.split(".")[:3])) __license__ = "MIT" __author__ = "OpenCyphal" diff --git a/pydsdl/third_party/parsimonious/expressions.py b/pydsdl/third_party/parsimonious/expressions.py index dda8fd9..192eb17 100644 --- a/pydsdl/third_party/parsimonious/expressions.py +++ b/pydsdl/third_party/parsimonious/expressions.py @@ -6,7 +6,7 @@ # TODO: Make sure all symbol refs are local--not class lookups or # anything--for speed. And kill all the dots. -from inspect import getargspec +from inspect import getfullargspec import re from six import integer_types, python_2_unicode_compatible @@ -57,7 +57,7 @@ def foo(text, pos, cache, error, grammar): part of, to make delegating to other rules possible """ - num_args = len(getargspec(callable).args) + num_args = len(getfullargspec(callable).args) if num_args == 2: is_simple = True elif num_args == 5: