Python 3.10 related changes: updated deprecated imports, bumped cytho…

…n and pytest versions, updated build scripts
kaaengine · Mar 8, 2022 · 5750895 · 5750895
1 parent 61922c0
commit 5750895
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/.ci/az-pipelines/make_wheels.yml b/.ci/az-pipelines/make_wheels.yml
@@ -38,6 +38,9 @@ jobs:
       Python39:
         python.version: '3.9'
         python.version_tag: 'py39'
+      Python310:
+        python.version: '3.10'
+        python.version_tag: 'py310'
   variables:
     docker_image: "quay.io/pypa/manylinux2010_x86_64"
     platform.name: 'linux'
@@ -77,6 +80,9 @@ jobs:
       Python39:
         python.version: '3.9'
         python.version_tag: 'py39'
+      Python310:
+        python.version: '3.10'
+        python.version_tag: 'py310'
   variables:
     platform.name: 'windows'
   steps:
@@ -106,6 +112,9 @@ jobs:
       Python39:
         python.version: '3.9'
         python.version_tag: 'py39'
+      Python310:
+        python.version: '3.10'
+        python.version_tag: 'py310'
   variables:
     platform.name: 'macos'
     platform.tag: 'macosx-10.14-x86_64'

diff --git a/requirements/build.txt b/requirements/build.txt
@@ -1,4 +1,4 @@
 ninja==1.9.0.post1
-Cython==0.29.21
+Cython==0.29.28
 scikit-build==0.11.1
 cymove==1.0.0
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1 +1 @@
-pytest==6.2.1
+pytest==6.2.5
diff --git a/scripts/docker_wheel_builder.sh b/scripts/docker_wheel_builder.sh
@@ -29,6 +29,10 @@ then
             PY_VERSION="python3.9"
             PY_VERSION_ABI="cp39-cp39"
             ;;
+        "py310")
+            PY_VERSION="python3.10"
+            PY_VERSION_ABI="cp310-cp310"
+            ;;
         *)
             echo "ERROR: Unknown py version specified: $1"
             exit 1
@@ -46,7 +50,7 @@ python --version
 
 yum install -y alsa-lib-devel pulseaudio-libs-devel  # SDL audio dependencies
 yum install -y libXrandr-devel libXcursor-devel  # SDL video dependencies
-pip install -r /host/requirements/build.txt -r /host/requirements/dev.txt
+pip install cmake -r /host/requirements/build.txt
 
 # simulate out-of-source build
 cp -r /host/src -v .

diff --git a/src/kaa/input.pxi b/src/kaa/input.pxi
@@ -1,6 +1,6 @@
 import inspect
 from enum import IntEnum
-from collections import Iterable
+from collections.abc import Iterable
 
 import cython
 from libcpp cimport nullptr