Merge pull request #1 from beenje/python311-support

Fix python 3.11 support
conda-forge · Sep 8, 2023 · 4ddac51 · 4ddac51
2 parents 7ee758a + 8e3e49f
commit 4ddac51
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 26 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,11 +10,13 @@ source:
   sha256: 8c5a2947d6e9fd732d2d887fa02216beebb4068ab99e2590590f491425992bc6
   patches:
     - remove_getattr_entrypoint.diff
+    # From https://github.com/pjkundert/cpppo/pull/110
+    - python-311-support-pr110.patch
 
 build:
   noarch: python
   script: {{ PYTHON }} -m pip install . -vv
-  number: 0
+  number: 1
   entry_points:
     - enip_server = cpppo.server.enip.main:main
     - enip_client = cpppo.server.enip.client:main

diff --git a/recipe/python-311-support-pr110.patch b/recipe/python-311-support-pr110.patch
@@ -0,0 +1,65 @@
+diff --git a/misc.py b/misc.py
+index 99a41ad..f063b97 100644
+--- a/misc.py
++++ b/misc.py
+@@ -136,41 +136,29 @@ def change_function( function, **kwds ):
+
+     will change the func's co_filename to the specified string.
+
+-    The types.CodeType constructor differs between Python 2 and 3; see
+-    type help(types.CodeType) at the interpreter prompt for information:
++    The types.CodeType constructor differs between Python versions; see
++    type help(types.CodeType) at the interpreter prompt for information.
+
+-    Python2:
+-        code(argcount,                nlocals, stacksize, flags, codestring,
+-         |        constants, names, varnames, filename, name, firstlineno,
+-         |        lnotab[, freevars[, cellvars]])
++    """
+
+-    Python3:
+-        code(argcount, kwonlyargcount, nlocals, stacksize, flags, codestring,
+-         |        constants, names, varnames, filename, name, firstlineno,
+-         |        lnotab[, freevars[, cellvars]])
++    version_lookup = {
++        (2, 7):  ["co_argcount", "co_nlocals", "co_stacksize", "co_flags", "co_code", "co_consts", "co_names", "co_varnames", "co_filename", "co_name", "co_firstlineno", "co_lnotab", "co_freevars", "co_cellvars"],
++        (3, 7):  ["co_argcount", "co_kwonlyargcount", "co_nlocals", "co_stacksize", "co_flags", "co_code", "co_consts", "co_names", "co_varnames", "co_filename", "co_name", "co_firstlineno", "co_lnotab", "co_freevars", "co_cellvars"],
++        (3, 8):  ["co_argcount", "co_posonlyargcount", "co_kwonlyargcount", "co_nlocals", "co_stacksize", "co_flags", "co_code", "co_consts", "co_names", "co_varnames", "co_filename", "co_name", "co_firstlineno", "co_lnotab", "co_freevars", "co_cellvars"],
++        (3, 9):  ["co_argcount", "co_posonlyargcount", "co_kwonlyargcount", "co_nlocals", "co_stacksize", "co_flags", "co_code", "co_consts", "co_names", "co_varnames", "co_filename", "co_name", "co_firstlineno", "co_lnotab", "co_freevars", "co_cellvars"],
++        (3, 10): ["co_argcount", "co_posonlyargcount", "co_kwonlyargcount", "co_nlocals", "co_stacksize", "co_flags", "co_code", "co_consts", "co_names", "co_varnames", "co_filename", "co_name", "co_firstlineno", "co_linetable", "co_freevars", "co_cellvars"],
++        (3, 11): ["co_argcount", "co_posonlyargcount", "co_kwonlyargcount", "co_nlocals", "co_stacksize", "co_flags", "co_code", "co_consts", "co_names", "co_varnames", "co_filename", "co_name", "co_qualname", "co_firstlineno", "co_linetable", "co_exceptiontable", "co_freevars", "co_cellvars"]
++    }
+
++    version, minor = sys.version_info[0], sys.version_info[1]
+
+-    """
+-    # Enumerate  all the __code__ attributes in the same order; types.CodeTypes
+-    # doesn't accept keyword args, only position.
+-    attrs			= [ "co_argcount" ]
+-    if sys.version_info[0] >= 3:
+-        attrs		       += [ "co_kwonlyargcount" ]
+-        if sys.version_info[1] >= 8:
+-            attrs	       += [ "co_posonlyargcount" ]
+-    attrs		       += [ "co_nlocals",
+-                                    "co_stacksize",
+-                                    "co_flags",
+-                                    "co_code",
+-                                    "co_consts",
+-                                    "co_names",
+-                                    "co_varnames",
+-                                    "co_filename",
+-                                    "co_name",
+-                                    "co_firstlineno",
+-                                    "co_lnotab",
+-                                    "co_freevars",
+-                                    "co_cellvars" ]
++    # Clamp major version to 2 or 3
++    version = max(min(version, 3), 2)
++
++    # Clamp minor version to 7-11
++    minor = max(min(minor, 11), 7)
++
++    attrs = version_lookup[(version, minor)]
+
+     assert all( k in attrs for k in kwds ), \
+         "Invalid function keyword(s) supplied: %s" % ( ", ".join( kwds.keys() ))