Minor cleanup for python v3.10 (#456)

Now that python v3.10 is released we don't need to keep on testing on v3.10.0-rc2. Also fix a minor issue with thread names
benfred · Oct 8, 2021 · 9fd1949 · 9fd1949
1 parent 385e7d2
commit 9fd1949
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,7 +111,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [2.7.17, 2.7.18, 3.5.4, 3.5.9, 3.5.10, 3.6.7, 3.6.8, 3.6.9, 3.6.10, 3.6.11, 3.6.12, 3.6.13, 3.6.14, 3.6.15, 3.7.1, 3.7.5, 3.7.6, 3.7.7, 3.7.8, 3.7.9, 3.7.10, 3.7.11, 3.7.12, 3.8.0, 3.8.1, 3.8.2, 3.8.3, 3.8.4, 3.8.5, 3.8.6, 3.8.7, 3.8.8, 3.8.9, 3.8.10, 3.8.11, 3.8.12, 3.9.0, 3.9.1, 3.9.2, 3.9.3, 3.9.4, 3.9.5, 3.9.6, 3.9.7, 3.10.0, 3.10.0-rc.2]
+        python-version: [2.7.17, 2.7.18, 3.5.4, 3.5.9, 3.5.10, 3.6.7, 3.6.8, 3.6.9, 3.6.10, 3.6.11, 3.6.12, 3.6.13, 3.6.14, 3.6.15, 3.7.1, 3.7.5, 3.7.6, 3.7.7, 3.7.8, 3.7.9, 3.7.10, 3.7.11, 3.7.12, 3.8.0, 3.8.1, 3.8.2, 3.8.3, 3.8.4, 3.8.5, 3.8.6, 3.8.7, 3.8.8, 3.8.9, 3.8.10, 3.8.11, 3.8.12, 3.9.0, 3.9.1, 3.9.2, 3.9.3, 3.9.4, 3.9.5, 3.9.6, 3.9.7, 3.10.0]
         # TODO: also test windows
         os: [ubuntu-latest, macos-latest]
     steps:

diff --git a/ci/update_python_test_versions.py b/ci/update_python_test_versions.py
@@ -15,7 +15,7 @@ def get_github_python_versions():
     raw_versions = [v["version"] for v in versions_json]
     versions = []
     for version_str in raw_versions:
-        if "-" in version_str and version_str != "3.10.0-rc.2":
+        if "-" in version_str:
             continue
 
         major, minor, patch = parse_version(version_str)

diff --git a/src/python_threading.rs b/src/python_threading.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use failure::Error;
 
-use crate::python_bindings::{v3_6_6, v3_7_0, v3_8_0, v3_9_5};
+use crate::python_bindings::{v3_6_6, v3_7_0, v3_8_0, v3_9_5, v3_10_0};
 use crate::python_interpreters::{InterpreterState, Object, TypeObject};
 use crate::python_spy::PythonSpy;
 use crate::python_data_access::{copy_string, copy_long, DictIterator};
@@ -64,7 +64,7 @@ pub fn thread_name_lookup(process: &PythonSpy) -> Option<HashMap<u64, String>> {
         Version{major: 3, minor: 7, ..} => _thread_name_lookup::<v3_7_0::_is>(&process),
         Version{major: 3, minor: 8, ..} => _thread_name_lookup::<v3_8_0::_is>(&process),
         Version{major: 3, minor: 9, ..} => _thread_name_lookup::<v3_9_5::_is>(&process),
-        Version{major: 3, minor: 10, ..} => _thread_name_lookup::<v3_9_5::_is>(&process),
+        Version{major: 3, minor: 10, ..} => _thread_name_lookup::<v3_10_0::_is>(&process),
         _ => return None
     };
     err.ok()